funit 0.9.4 → 0.10.0

data/History.txt

@@ -1,4 +1,25 @@
-=== 0.9.4 / 2007-01-08
+=== 0.10.0 / 2008-03-30 (all courtesy of Diego Virasoro)
+
+* 4 major enchancements
+  * User can now use 'funit --clean' to remove the generated files
+  * Source directory and test directory can be different: specify
+    source dir with -s (or --source) flag
+  * Only the minimum number of files that need recompilation are compiled
+    via makefile
+  * The .fun file name is not constrained anymore, but now each test suite
+    must be surrounded by 'test_suite name' and 'end test_suite', where name
+    is the name of the module to be tested
+  * Multiple test suites can exist inside the same file
+
+* 5 minor enchancements
+  * Change blocks nomenclature: beginTest -> test and endTest -> end test
+    (and similarly for setup and teardown)
+  * Change assertions nomenclature (eg. IsEqual -> assert_equal)
+  * Added one new assertion: assert_array_equal
+  * Added a summary of all the test suites results, printed at the end
+  * Minor code clean-up
+
+=== 0.9.4 / 2008-01-08
 
 * 2 minor enhancements
   * broke up more long conditionals with continuation

data/README.txt

@@ -109,11 +109,8 @@ rewrote the framework in Ruby[http://www.ruby-lang.org].
 
 == TODO:
 
-* Rename assertions to more consistent with other xUnits.
-* Use <tt>test</tt> keyword instead of <tt>beginTest</tt> business.
+* Add --version option.
 * To avoid Fortran's 32-character limit, don't add test name during translation.
-* Add some command line options (especially <tt>clean</tt>), possibly
-  using CmdParse[http://cmdparse.rubyforge.org].
 * Add assertions that capture stops, warning messages, and other exits.
 * For compilation, use internal rake task instead of a single, ordered command line.
 * Allow users to specify dependency search paths (currently hardwired).

data/Rakefile

@@ -3,7 +3,9 @@
 require 'rubygems'
 require 'hoe'
 
-require './lib/funit.rb'
+$LOAD_PATH.unshift File.join( File.dirname(__FILE__), 'lib')
+
+require 'funit.rb'
 
 Hoe.new('funit', Funit::VERSION) do |funit|
   funit.rubyforge_name  = 'nasarb'
@@ -11,10 +13,20 @@ Hoe.new('funit', Funit::VERSION) do |funit|
   funit.extra_deps << [ 'fortran', '>= 1.0.1' ]
   funit.spec_extras[:requirements] = "A Fortran compiler."
   funit.author =
-    [ 'Karen Bibb','Bil Kleb','Beth Lee-Rausch','Mike Park','Bill Wood']
+    [ 'Karen Bibb', 'Bil Kleb', 'Beth Lee-Rausch', 'Mike Park', 'Bill Wood' ]
   funit.email = 'nasarb-developers@rubyforge.org'
-  funit.clean_globs.concat %w( **/*_fun.f90 examples/**/TestRunner* **/*.o **/*.mod **/*.MOD )
+  funit.clean_globs.
+    concat %w[ **/*_fun.f90 **/makeTestRunner examples/**/TestRunner* **/*.o **/*.mod **/*.MOD ]
   funit.rsync_args = '-rpv --delete' # to preserve group permissions 
 end
 
+desc "run all examples"
+task :examples do
+  Dir['examples/*'].each do |dir|
+    cd dir do
+      ruby "-Ilib ../../bin/funit"
+    end
+  end
+end
+
 # vim: syntax=Ruby

data/bin/funit

@@ -6,10 +6,57 @@ begin require 'rubygems'; rescue LoadError; end
 
 $:.push "#{File.dirname $0}/../lib"
 require 'funit'
+require 'getoptlong'
 
 include Funit
 
-Funit::run_tests
+prog_source_dir = nil
+  
+opts = GetoptLong.new(
+ ['--help', '-h', GetoptLong::NO_ARGUMENT],
+ ['--clean', '-c', GetoptLong::NO_ARGUMENT],
+ ['--source', '-s', GetoptLong::REQUIRED_ARGUMENT]
+)
+
+opts.each do |opt,arg|
+  begin
+    case opt
+      when '--help'
+        Funit::print_help
+        exit
+      when '--clean'
+        Funit::clean_genFiles
+        exit
+      when '--source'
+        if(ENV['FSFLAG'].nil?) then
+          puts <<-EOF
+No environment variable FSFLAG set.
+
+For example for most compilers such as gfortran you will need: -I
+      sh: export FSFLAG=-I
+     csh: setenv FSFLAG -I
+ windows: set FSFLAG=-I
+
+but for some such as Sun's f95 compiler you will need: -M
+      sh: export FSFLAG=-M
+     csh: setenv FSFLAG -M
+ windows: set FSFLAG=-M
+          EOF
+          exit
+        end
+        prog_source_dir = arg
+    end
+  rescue => err
+    puts err
+    break
+  end
+end
+
+if(prog_source_dir.nil?) then
+  Funit::run_tests
+else
+  Funit::run_tests(prog_source_dir)
+end
 
 #--
 # Copyright 2006-2007 United States Government as represented by

data/examples/CFD/FluxFunctions.fun

@@ -1,47 +1,51 @@
+test_suite FluxFunctions
+
 real :: leftState, rightState, interfaceFlux
 
-beginsetup
+setup
   leftState  = 0
   rightState = 1
-endsetup
+end setup
 
-beginTest FluxZero
+test FluxZero
   real :: state
   state = 0
-  IsEqualWithin( 0, Flux(state), 0.00001 )
-endTest
+  Assert_Equal_Within( 0, Flux(state), 0.00001 )
+end test
  
-beginTest FluxOne
+test FluxOne
   real :: state = 1
-  IsEqualWithin( 0.5, Flux(state), 0.00001 )
-endTest
+  Assert_Equal_Within( 0.5, Flux(state), 0.00001 )
+end test
 
-beginTest RoeAvgZero
-  IsRealEqual( 0, RoeAvg(0.0,0.0) )
-  IsFalse( RoeAvg(0.0,0.0)==1 )
-endTest
+test RoeAvgZero
+  Assert_Real_Equal( 0, RoeAvg(0.0,0.0) )
+  Assert_False( RoeAvg(0.0,0.0)==1 )
+end test
 
-beginTest RoeAvgKnown
-  IsRealEqual( 0.5, RoeAvg(leftState,rightState) )
-  IsTrue( RoeAvg(leftState,rightState) > 0 )
-endTest
+test RoeAvgKnown
+  Assert_Real_Equal( 0.5, RoeAvg(leftState,rightState) )
+  Assert_True( RoeAvg(leftState,rightState) > 0 )
+end test
 
-beginTest CentralFluxKnown
+test CentralFluxKnown
   call CentralFlux( leftState, rightState, interfaceFlux )
-  IsEqualWithin( 0.25, interfaceFlux, 0.001 )
-  IsEqualWithin( 0.25, interfaceFlux, 0.00000001 )
-  IsEqual( 0.25, interfaceFlux )
-endTest
+  Assert_Equal_Within( 0.25, interfaceFlux, 0.001 )
+  Assert_Equal_Within( 0.25, interfaceFlux, 0.00000001 )
+  Assert_Equal( 0.25, interfaceFlux )
+end test
 
-beginTest RoeFluxExpansionShock
+test RoeFluxExpansionShock
   leftState = -1
   call RoeFlux( leftState, rightState, interfaceFlux )
-  IsEqual( 0.5, interfaceFlux )
-endTest
+  Assert_Equal( 0.5, interfaceFlux )
+end test
 
-beginTest RoeFluxZero
+test RoeFluxZero
   rightState = 0
   call RoeFlux( leftState, rightState, interfaceFlux )
-  IsRealEqual( 0, interfaceFlux )
-  IsEqual( 0, interfaceFlux )
-endTest
+  Assert_Real_Equal( 0, interfaceFlux )
+  Assert_Equal( 0, interfaceFlux )
+end test
+
+end test_suite

data/examples/CFD/GasModel.fun

@@ -1,20 +1,24 @@
-real            :: Pressure, Density, Energy
+test_suite GasModel
 
-beginTest PerfectPZeroed
+  real            :: Pressure, Density, Energy
+
+test PerfectPZeroed
   real, parameter :: zero = 0
   call PerfectP (zero, zero, Pressure)
-  isRealEqual ( 0, Pressure )
-  IsEqualwithin ( 0, Pressure, 0.0000000001 )
-endTest
+  Assert_Real_Equal( 0, Pressure )
+  Assert_Equal_within( 0, Pressure, 0.0000000001 )
+end test
 
-begintest Warbler
-endtest
+test Warbler
+end test
 
-beginTest PerfectPKnown
+test PerfectPKnown
   real :: Density = 1
   Energy  = 1
   call PerfectP( Density, Energy, Pressure )
-  IsRealEqual( 0.4, Pressure )
-  IsTrue  ( Pressure > 0 )
-  IsFalse( Pressure < 0 )
-endTest
+  Assert_Real_Equal( 0.4, Pressure )
+  Assert_True( Pressure > 0 )
+  Assert_False( Pressure < 0 )
+end test
+
+end test_suite

data/examples/ReadData/time_series_data.fun

@@ -1,28 +1,33 @@
-character(len=*), parameter :: FILE = 'values.txt'
+test_suite time_series_data
 
-beginSetup
+  character(len=10), parameter :: FILE = 'values.txt'
+
+setup
   open(8, file=FILE)
     write(8,'(a)'), '200609300000 0.223200546265E+003'
     write(8,'(a)'), '200609300132 0.226001495361E+003'
   close(8)
-endSetup
+end setup
 
-beginTest load_time_series_data_from_file
+test load_time_series_data_from_file
   call read_time_series( FILE )
-  IsEqual(        2006, ts_data(1)%date_time%year )
-  IsEqual(           9, ts_data(1)%date_time%month )
-  IsEqual(          30, ts_data(1)%date_time%day )
-  IsEqual(           0, ts_data(1)%date_time%hour )
-  IsEqual(           0, ts_data(1)%date_time%minute )
-  IsEqualWithin( 223.2, ts_data(1)%value, 0.1 )
-  IsEqual(        2006, ts_data(2)%date_time%year )
-  IsEqual(           9, ts_data(2)%date_time%month )
-  IsEqual(          30, ts_data(2)%date_time%day )
-  IsEqual(           1, ts_data(2)%date_time%hour )
-  IsEqual(          32, ts_data(2)%date_time%minute )
-  IsEqualWithin( 226.0, ts_data(2)%value, 0.1 )
-endTest
+  Assert_Equal(         2006, ts_data(1)%date_time%year )
+  Assert_Equal(            9, ts_data(1)%date_time%month )
+  Assert_Equal(           30, ts_data(1)%date_time%day )
+  Assert_Equal(            0, ts_data(1)%date_time%hour )
+  Assert_Equal(            0, ts_data(1)%date_time%minute )
+  Assert_Equal_Within( 223.2, ts_data(1)%value, 0.1 )
+  Assert_Equal(         2006, ts_data(2)%date_time%year )
+  Assert_Equal(            9, ts_data(2)%date_time%month )
+  Assert_Equal(           30, ts_data(2)%date_time%day )
+  Assert_Equal(            1, ts_data(2)%date_time%hour )
+  Assert_Equal(           32, ts_data(2)%date_time%minute )
+  Assert_Equal_Within( 226.0, ts_data(2)%value, 0.1 )
+end test
+
+teardown
+  call system('/bin/rm '//FILE)
+end teardown
+
+end test_suite
 
-beginTeardown
-  call system('rm '//FILE)
-endTeardown

data/examples/StopWatch/StopWatch.fun

@@ -1,49 +1,51 @@
+test_suite StopWatch
+
 integer, dimension(8) :: dateAndTime1, dateAndTime2
 real :: seconds
 
-beginSetup
+setup
   NotInitialized = .TRUE.
   last    = 0
   seconds = HUGE(0.0)
-endSetup
+end setup
 
-beginTest SystemDateAndTimeWorks
+test SystemDateAndTimeWorks
  call date_and_time(values=dateAndTime1)
- IsTrue( dateAndTime1(1) /= -huge(0) )
- IsTrue( size(dateAndTime1,1) == 8 )
-endTest
+ Assert_True( dateAndTime1(1) /= -huge(0) )
+ Assert_True( size(dateAndTime1,1) == 8 )
+end test
 
 ! test secBetween
-beginTest OneMSecDifference
+test OneMSecDifference
   dateAndTime1 = (/ 2000, 1, 1, 0, 0, 0, 0, 0 /)
   dateAndTime2 = (/ 2000, 1, 1, 0, 0, 0, 0, 1 /)
   seconds = SecBetween(dateAndTime1, dateAndTime2)
-  IsRealEqual( 0.001, seconds)
-endTest
+  Assert_Real_Equal( 0.001, seconds)
+end test
 
-beginTest MinuteRollover
+test MinuteRollover
   dateAndTime1 = (/ 2000, 1, 1, 0, 0, 0,59, 0 /)
   dateAndTime2 = (/ 2000, 1, 1, 0, 0, 1, 0, 0 /)
   seconds = SecBetween(dateAndTime1, dateAndTime2)
-  IsRealEqual( 1.0, seconds )
-endTest
+  Assert_Real_Equal( 1.0, seconds )
+end test
 
 ! test secSinceLast
-beginTest InitializationState
-  IsTrue(notInitialized)
+test InitializationState
+  Assert_True(notInitialized)
   seconds = secSinceLast()
-  IsFalse(notInitialized)
+  Assert_False(notInitialized)
   seconds = secSinceLast()
-  IsFalse(notInitialized)
-endTest
+  Assert_False(notInitialized)
+end test
 
-beginTest InitiallyReturnsZero
+test InitiallyReturnsZero
   seconds = secSinceLast()
-  IsRealEqual( 0.0, seconds )
+  Assert_Real_Equal( 0.0, seconds )
   call timeDelay(seconds)
   seconds = secSinceLast()
-  IsTrue( seconds /= 0.0 )
-endTest
+  Assert_True( seconds /= 0.0 )
+end test
 
 subroutine timeDelay (sum)
   integer :: i
@@ -53,14 +55,14 @@ subroutine timeDelay (sum)
   enddo
 end subroutine timeDelay
 
-beginTest ComputesSeconds
+test ComputesSeconds
   seconds = secSinceLast()
   call timeDelay (seconds)
   seconds = secSinceLast()
-  IsTrue( seconds > 0.0 )
-endTest
+  Assert_True( seconds > 0.0 )
+end test
 
-beginTest ComputesSecondsSpecial
+test ComputesSecondsSpecial
   real :: expectedSeconds
 
   seconds = secSinceLast()
@@ -69,5 +71,7 @@ beginTest ComputesSecondsSpecial
   seconds = secSinceLast()
   dateAndTime2 = last
   expectedSeconds = secBetween(dateAndTime1,dateAndTime2)
-  IsRealEqual( expectedSeconds, seconds )
-endTest
+  Assert_Real_Equal( expectedSeconds, seconds )
+end test
+
+end test_suite

data/lib/funit.rb

@@ -10,25 +10,62 @@ require 'funit/compiler'
 require 'funit/functions'
 require 'funit/assertions'
 require 'funit/testsuite'
+require 'fileutils'
 
 module Funit
 
-  ##
-  # the version of this fUnit
-
-  VERSION = '0.9.4'
+  VERSION = '0.10.0'
 
   ##
   # run all tests
 
-  def run_tests
+  def run_tests(prog_source_dir='.')
     Compiler.new# a test for compiler env set (FIXME: remove this later)
-    write_test_runner( test_suites = parse_command_line )
-    test_suites.each{ |test_suite| TestSuite.new test_suite }
-    compile_tests test_suites
+    write_test_runner( test_files = parse_command_line )
+    test_suites = []
+    test_files.each{ |test_file|
+      tf_content = IO.read(test_file+'.fun')
+      tf_content.scan(/test_suite\s+(\w+)(.*?)end\s+test_suite/m).each{|ts|
+        ts_name = $1
+        if((!File.exist?(ts_name+"_fun.f90")) || File.mtime(ts_name+"_fun.f90") < File.mtime(test_file+".fun")) then
+          TestSuite.new(ts_name, $2)
+        end
+        test_suites.push(ts_name)
+      }
+    }
+    compile_tests(test_suites,prog_source_dir)
     raise "TestRunner failed to execute." unless system "env PATH='.' TestRunner"
   end
 
+  ##
+  # remove files generated by fUnit
+
+  def clean_genFiles
+    module_names = Dir["**/*.fun"].map{|mn| mn.chomp(".fun")}
+    tbCancelled = module_names.map{|mn| mn+"_fun."} + ["TestRunner."]
+    tbCancelled = tbCancelled.map{|tbc| [tbc+"f90",tbc+"o",tbc+"MOD"]}.flatten
+    tbCancelled += Dir["**/TestRunner"]
+    tbCancelled += Dir["**/makeTestRunner"]
+    tbCancelled = (tbCancelled+tbCancelled.map{|tbc| tbc.downcase}).uniq
+    FileUtils.rm_f(tbCancelled)
+  end
+
+  ##
+  # prints a usage help for the user
+
+  def print_help
+    puts <<-END_OF_HELP
+      To use fUnit, type:
+        funit [-options] [test_file_name(s)]
+      The argument(s) is optional. If no argument is given, then all the .fun files inside the working directory will be used.
+
+      The options are:
+        --clean                   => To remove the files generated by fUnit
+        -h, --help                => Prints this help
+        -s <dir>, --source <dir>  => To specify a directory for the non-test source
+    END_OF_HELP
+  end
+
 end
 
 #--

data/lib/funit/assertions.rb

@@ -1,4 +1,3 @@
-require 'strscan'
 
 module Funit
   
@@ -7,53 +6,65 @@ module Funit
 
   module Assertions
 
-    def istrue(line)
+    ASSERTION_PATTERN =
+     /^\s*?(assert_(array_equal|real_equal|false|true|equal_within|equal))\(.*\)/i
+
+    def assert_true(line)
       line.match(/\((.+)\)/)
-      @type = 'IsTrue'
+      @type = 'Assert_True'
       @condition = ".not.(#$1)"
       @message = "\"#$1 is not true\""
       syntax_error("invalid body for #@type",@suite_name) unless $1=~/\S+/
       write_assert
     end
 
-    def isfalse(line)
+    def assert_false(line)
       line.match(/\((.+)\)/)
-      @type = 'IsFalse'
+      @type = 'Assert_False'
       @condition = "#$1"
       @message = "\"#$1 is not false\""
       syntax_error("invalid body for #@type",@suite_name) unless $1=~/\S+/
       write_assert
     end
 
-    def isrealequal(line)
+    def assert_real_equal(line)
       line.match(/\((.*)\)/)
       expected, actual = *(get_args($1))
-      @type = 'IsRealEqual'
+      @type = 'Assert_Real_Equal'
       @condition = ".not.( (#{expected} &\n        +2*spacing(real(#{expected})) ) &\n        .ge. &\n        (#{actual}) &\n            .and. &\n     (#{expected} &\n      -2*spacing(real(#{expected})) ) &\n      .le. &\n       (#{actual}) )"
       @message = "\"#{actual} (\", &\n #{actual}, &\n  \") is not\", &\n #{expected},\&\n \"within\", &\n  2*spacing(real(#{expected}))"
       syntax_error("invalid body for #@type",@suite_name) unless $&
       write_assert
     end
 
-    def isequalwithin(line)
+    def assert_equal_within(line)
       line.match(/\((.*)\)/)
       expected, actual, tolerance = *(get_args($1))
-      @type = 'IsEqualWithin'
+      @type = 'Assert_Equal_Within'
       @condition = ".not.((#{actual} &\n     +#{tolerance}) &\n     .ge. &\n     (#{expected}) &\n             .and. &\n     (#{actual} &\n     -#{tolerance}) &\n     .le. &\n     (#{expected}) )"
       @message = "\"#{expected} (\",#{expected},\") is not\", &\n #{actual},\"within\",#{tolerance}"
       syntax_error("invalid body for #@type",@suite_name) unless $&
       write_assert
     end
 
-    def isequal(line)
+    def assert_equal(line)
       line.match(/\((\w+\(.*\)|[^,]+),(.+)\)/)
-      @type = 'IsEqual'
+      @type = 'Assert_Equal'
       @condition = ".not.(#$1==#$2)"
       @message = "\"#$1 (\",#$1,\") is not\", #$2"
       syntax_error("invalid body for #@type",@suite_name) unless $&
       write_assert
     end
     
+    def assert_array_equal(line)
+      line.match(/\((\w+),(\w+)\)/)
+      @type = 'Assert_Array_Equal'
+      @condition = ".not. all(#$1==#$2)"
+      @message = "\"array #$1 is not #$2\""
+      syntax_error("invalid body for #@type",@suite_name) unless $&
+      write_assert
+    end
+    
     ##
     # An argument scanner thanks to James Edward Gray II
     # by way of ruby-talk mailing list.

data/lib/funit/functions.rb

@@ -2,31 +2,64 @@ require 'erb'
 
 module Funit
 
-  TEST_RUNNER = ERB.new %q{
+  TEST_RUNNER = ERB.new( %q{
     ! TestRunner.f90 - runs fUnit test suites
     !
     ! <%= File.basename $0 %> generated this file on <%= Time.now %>.
 
     program TestRunner
-      <%= test_suites.inject('') { |result,test_suite| result << "\n  use #{test_suite}_fun" } %>
 
-      implicit none
+      <% test_suites.each do |test_suite| -%>
+      use <%= test_suite %>_fun
+      <% end -%>
 
-      integer :: numTests, numAsserts, numAssertsTested, numFailures
+      implicit none
 
-      <% test_suites.each do |ts| %>
-      print *, ""
-      print *, "<%= ts %> test suite:"
-      call test_<%= ts %> &
-        ( numTests, numAsserts, numAssertsTested, numFailures )
-      print *, "Passed", numAssertsTested, "of", numAsserts, &
-               "possible asserts comprising",                &
-               numTests-numFailures, "of", numTests, "tests."
-      <% end %>
-      print *, ""
+      integer, dimension(<%=test_suites.size%>) :: numTests, numAsserts, numAssertsTested, numFailures
+
+      <% test_suites.each_with_index do |test_suite,i| -%>
+      write(*,*)
+      write(*,*) "<%= test_suite %> test suite:"
+      call test_<%= test_suite %> &
+        ( numTests(<%= i+1 %>), numAsserts(<%= i+1 %>), numAssertsTested(<%= i+1 %>), numFailures(<%= i+1 %>) )
+      write(*,*) "Passed", numAssertsTested(<%= i+1 %>), "of", numAsserts(<%= i+1 %>), &
+                 "possible asserts comprising", numTests(<%= i+1 %>)-numFailures(<%= i+1 %>), &
+                 "of", numTests(<%= i+1 %>), "tests."
+      <% end -%>
+
+      write(*,*)
+      write(*,'(a)') "==========[ SUMMARY ]=========="
+      <% max_length = test_suites.empty? ? 0 : test_suites.max.length -%>
+      <% test_suites.each_with_index do |test_suite,i| -%>
+      write(*,'(a<%=max_length+2%>)',advance="no") " <%= test_suite %>:"
+      if ( numFailures(<%= i+1 %>) == 0 ) then
+        write(*,*) " passed"
+      else
+        write(*,*) " failed   <<<<<"
+      end if
+      <% end -%>
+      write(*,*)
 
     end program TestRunner
-    }.gsub(/^/,'    '), nil, '<>' # turn off newlines due to <%%>
+    }.gsub(/^    /,''), nil, '-' ) # turn off newlines for <% -%>
+
+  MAKEFILE = ERB.new( %q{
+    # makefile to compile TestRunner.f90
+    #
+    # <%= File.basename $0 %> generated this file on <%= Time.now %>.
+
+    OBJ=<%= required_objects.join(' ') %>
+
+    all:testrunner
+
+    testrunner: $(OBJ)
+    <%= "\t#{ENV['FC']} #{ENV['FCFLAGS']}" %> -o TestRunner $(OBJ)
+
+    <% file_dependencies.each do |source,dep| -%>
+    <%= "#{source.sub(/\.f90/i,'.o')}: #{source} #{dep.map{ |d| d.sub(/\.f90/i,'.o') }.join(' ')}" %>
+    <%= "\t(cd #{File.dirname(source)}; #{ENV['FC']} #{ENV['FCFLAGS']} #{sourceflag} -c #{File.basename(source)})" %>
+    <% end -%>
+  }.gsub(/^    /,''), nil, '-' ) # turn off newlines for <% -%>
 
   def requested_modules(module_names)
     if module_names.empty?
@@ -76,13 +109,29 @@ module Funit
     $stderr.puts "\n *Warning: #{message} [#{test_suite}.fun:#$.]"
   end
 
-  def compile_tests test_suites
+  def compile_tests(test_suites,prog_source_dir='.')
     puts "computing dependencies"
-    dependencies = Fortran::Dependencies.new
+
+    # calculates parameters
+    if ( prog_source_dir=='.' ) then
+      sourceflag = ""
+    else
+#      prog_source_dir = File.expand_path(prog_source_dir)  # commented as it doesn't seem necessary
+      sourceflag = " "+ ENV['FSFLAG'] + prog_source_dir
+    end
+    current_dir = `pwd`.chomp
+    sp = ['.'] + (prog_source_dir.empty? ? [] : [prog_source_dir])
+
+    dependencies = Fortran::Dependencies.new(:search_paths=> sp)
     puts "locating associated source files and sorting for compilation"
-    required_sources = dependencies.required_source_files('TestRunner.f90')
+    dependencies.source_file_dependencies('TestRunner.f90')
+    file_dependencies = dependencies.file_dependencies
+    required_objects = file_dependencies.values.flatten.uniq.map{|s|s.sub(/\.f90/i,'.o')}
+    required_objects << 'TestRunner.o'
+
+    File.open("makeTestRunner", "w") {|file| file.puts MAKEFILE.result(binding)}
 
-    puts compile = "#{ENV['FC']} #{ENV['FCFLAGS']} -o TestRunner #{required_sources.join(' ')}"
+    compile = "make -f makeTestRunner"
 
     raise "Compile failed." unless system compile
   end

data/lib/funit/testsuite.rb

@@ -1,6 +1,4 @@
-require 'funit/assertions'
-require 'funit/functions'
-require 'ftools' # FIXME: use fileutils
+require 'funit'
 
 module Funit
   
@@ -11,15 +9,16 @@ module Funit
 
   class TestSuite < File
 
-    ASSERTION_PATTERN = /Is(RealEqual|False|True|EqualWithin|Equal)\(.*\)/i
-    KEYWORDS = /(begin|end)(Setup|Teardown|Test)|Is(RealEqual|Equal|False|True|EqualWithin)\(.*\)/i
+    KEYWORDS = Regexp.union(/(end\s+)?(setup|teardown|test)/i,
+                            Assertions::ASSERTION_PATTERN)
     COMMENT_LINE = /^\s*!/
     
     include Funit #FIXME
 
-    def initialize suite_name
+    def initialize suite_name, suite_content=''
       @line_number = 'blank'
       @suite_name = suite_name
+      @suite_content = suite_content
       return nil unless funit_exists?(suite_name)
       File.delete(suite_name+"_fun.f90") if File.exists?(suite_name+"_fun.f90")
       super(suite_name+"_fun.f90","w")
@@ -57,10 +56,8 @@ module #{@suite_name}_fun
     end
 
     def expand
-      funit_file = @suite_name+".fun"
-      $stderr.print "expanding #{funit_file}..."
-   
-      funit_contents = IO.readlines(funit_file)
+      $stderr.print "expanding test suite: #{@suite_name}..."
+      funit_contents = @suite_content.split("\n")
       @funit_total_lines = funit_contents.length
 
       while (line = funit_contents.shift) && line !~ KEYWORDS
@@ -75,20 +72,20 @@ module #{@suite_name}_fun
         case line
         when COMMENT_LINE
           puts line
-        when /beginSetup/i
+        when /^setup/i
           add_to_setup funit_contents
-        when /beginTeardown/i
+        when /^teardown/i
           add_to_teardown funit_contents
-        when /XbeginTest\s+(\w+)/i
+        when /^Xtest\s+(\w+)/i
           ignore_test($1,funit_contents)
-        when /beginTest\s+(\w+)/i
+        when /^test\s+(\w+)/i
           a_test($1,funit_contents)
-        when /beginTest/i
-          syntax_error "no name given for beginTest", @suite_name
-        when /end(Setup|Teardown|Test)/i
-          syntax_error "no matching begin#$1 for an #$&", @suite_name
-        when ASSERTION_PATTERN
-          syntax_error "#$1 assert not in a test block", @suite_name
+        when /^test/i
+          syntax_error "no name given for test", @suite_name
+        when /^end\s+(setup|teardown|test)/i
+          syntax_error "no matching #$1 for an #$&", @suite_name
+        when Assertions::ASSERTION_PATTERN
+          syntax_error "#$1 assertion not in a test block", @suite_name
         else
           puts line
         end
@@ -97,20 +94,20 @@ module #{@suite_name}_fun
     end
 
     def add_to_setup funit_contents
-      while (line = funit_contents.shift) && line !~ /endSetup/i
+      while (line = funit_contents.shift) && line !~ /end\s+setup/i
         @setup.push line
       end
     end
 
     def add_to_teardown funit_contents
-      while (line = funit_contents.shift) && line !~ /endTeardown/i
+      while (line = funit_contents.shift) && line !~ /end\s+teardown/i
         @teardown.push line
       end
     end
 
     def ignore_test test_name, funit_contents
       warning("Ignoring test: #{test_name}", @suite_name)
-      line = funit_contents.shift while line !~ /endTest/i
+      line = funit_contents.shift while line !~ /end\s+Test/i
     end
 
     def a_test test_name, funit_contents
@@ -122,14 +119,14 @@ module #{@suite_name}_fun
 
       num_of_asserts = 0
   
-      while (line = funit_contents.shift) && line !~ /endTest/i
+      while (line = funit_contents.shift) && line !~ /end\s+test/i
         case line
         when COMMENT_LINE
           puts line
-        when /Is(RealEqual|False|True|EqualWithin|Equal)/i
+        when Assertions::ASSERTION_PATTERN
           @line_number = @funit_total_lines - funit_contents.length
           num_of_asserts += 1
-          puts send( $&.downcase!, line )
+          puts send( $1.downcase, line )
         else
           puts line
         end
@@ -194,4 +191,4 @@ end
 #
 # This file is governed by the NASA Open Source Agreement.
 # See License.txt for details.
-#++
+#++

data/test/test_funit.rb

@@ -4,106 +4,120 @@ require 'ftools' # FIXME: migrate to fileutils
 
 class TestFunit < Test::Unit::TestCase
 
+  alias_method :tu_assert_equal, :assert_equal # avoid collision with test/unit
+
   include Funit # FIXME
   include Funit::Assertions # FIXME
 
   def setup
     File.rm_f(*Dir["dummyunit*"])
     File.rm_f(*Dir["unit*"])
+    File.rm_f(*Dir["another*"])
     File.rm_f(*Dir["ydsbe*"])
     File.rm_f(*Dir["lmzd*"])
     File.rm_f(*Dir["ldfdl*"])
     File.rm_f(*Dir["ydsbe*"])
-    File.rm_f(*Dir["TestRunner*"])
-    File.rm_f(*Dir["a.out"])
+    File.rm_f(*Dir["*TestRunner*"])
   end
 
   def teardown
     File.rm_f(*Dir["dummyunit*"])
     File.rm_f(*Dir["unit*"])
+    File.rm_f(*Dir["another*"])
     File.rm_f(*Dir["ydsbe*"])
     File.rm_f(*Dir["lmzd*"])
     File.rm_f(*Dir["ldfdl*"])
     File.rm_f(*Dir["ydsbe*"])
-    File.rm_f(*Dir["TestRunner*"])
-    File.rm_f(*Dir["a.out"])
+    File.rm_f(*Dir["*TestRunner*"])
   end
 
-  def test_main_driver_compiles
+  def test_empty_test_runner_created_and_compilable
     write_test_runner []
-    assert File.exists?("TestRunner.f90")
-    assert system("#{ENV['FC']} TestRunner.f90")
-    assert File.exists?("a.out")
+    assert File.exists?("TestRunner.f90"), 'TestRunner.f90 not created.'
+    compile_tests []
+    assert File.exists?("makeTestRunner"), 'makeTestRunner.f90 not created.'
+    assert system("make -f makeTestRunner"), 'make -f makeTestRunner failed.'
+    assert File.exists?("TestRunner"), 'TestRunner executable not created.'
   end
 
   def test_is_equal
     @suite_name = "dummy"
     @test_name = "dummy"
     @line_number = "dummy"
-    isequal("IsEqual(1.0,m(1,1))")
-    assert_equal '.not.(1.0==m(1,1))', @condition
-  end 
+    assert_equal("AssertEqual(1.0,m(1,1))")
+    tu_assert_equal '.not.(1.0==m(1,1))', @condition
+  end
 
   def test_is_real_equal
     @suite_name = "dummy"
     @test_name = "dummy"
     @line_number = "dummy"
-    isrealequal("IsRealEqual(a,b)")
+    assert_real_equal("AssertRealEqual(a,b)")
     ans = <<-EOF
 .not.( (a &\n        +2*spacing(real(a)) ) &\n        .ge. &\n        (b) &\n            .and. &\n     (a &\n      -2*spacing(real(a)) ) &\n      .le. &\n       (b) )
     EOF
-    assert_equal ans.chomp, @condition
-    assert_equal %|"b (", &\n b, &\n  ") is not", &\n a,&\n "within", &\n  2*spacing(real(a))|, @message
-    isrealequal("IsRealEqual(1.0,m(1,1))")
+    tu_assert_equal ans.chomp, @condition
+    tu_assert_equal %|"b (", &\n b, &\n  ") is not", &\n a,&\n "within", &\n  2*spacing(real(a))|, @message
+    assert_real_equal("AssertRealEqual(1.0,m(1,1))")
     ans = <<-EOF
 .not.( (1.0 &\n        +2*spacing(real(1.0)) ) &\n        .ge. &\n        (m(1,1)) &\n            .and. &\n     (1.0 &\n      -2*spacing(real(1.0)) ) &\n      .le. &\n       (m(1,1)) )
     EOF
-    assert_equal ans.chomp, @condition
+    tu_assert_equal ans.chomp, @condition
   end
 
-  def test_handles_dependency
+  def test_should_accommodate_use_dependency_at_least_one_level_deep
     File.open('unit.f90','w') do |f|
-      f.printf "module unit\n  use unita, only : a\nend module unit\n"
+      f.puts "module unit\n use another, only : a\nend module unit"
     end
-    File.open('unita.f90','w') do |f|
-      f.printf "module unita\n  integer :: a = 5\nend module unita\n"
+    File.open('another.f90','w') do |f|
+      f.puts "module another\n integer :: a = 5\nend module another"
     end
     File.open('unit.fun','w') do |f|
-      f.printf "beginTest a_gets_set\n  IsEqual(5, a)\nendTest\n"
+      f.puts "test_suite unit\ntest a_gets_set\nAssert_Equal(5,a)\nend test\nend test_suite"
     end
     assert_nothing_raised{run_tests}
   end
 
-  def test_embedded_dependencies
+  def test_should_accommodate_doubly_embedded_use_dependencies
     File.open('unit.f90','w') do |f|
-      f.printf "module unit\n  use unita, only : a\nend module unit\n"
+      f.puts "module unit\n use unita, only : a\nend module unit"
     end
     File.open('unita.f90','w') do |f|
-      f.printf "module unita\n  use unitb, only : b \n  integer :: a = b\nend module unita\n"
+      f.puts "module unita\n use unitb, only : b\n integer :: a = b\nend module unita"
     end
     File.open('unitb.f90','w') do |f|
-      f.printf "module unitb\n  integer,parameter :: b = 5\nend module unitb\n"
+      f.puts "module unitb\n integer, parameter :: b = 5\nend module unitb"
+    end
+    File.open('unit.fun','w') do |f|
+      f.puts "begin test_suite unit\ntest a_gets_set\n Assert_Equal(5, a)\nend test\nend test_suite"
+    end
+    assert_nothing_raised{run_tests}
+ end
+
+  def test_should_accommodate_cap_F_extensions
+    File.open('unit.F90','w') do |f|
+      f.puts "module unit\n integer :: a = 1\nend module unit"
     end
     File.open('unit.fun','w') do |f|
-      f.printf "beginTest a_gets_set\n  IsEqual(5, a)\nendTest\n"
+      f.puts "begin test_suite unit\ntest a_gets_set\n Assert_Equal(1, a)\nend test\nend test_suite"
     end
     assert_nothing_raised{run_tests}
  end
 
   def test_requested_modules
-    assert_equal ["asdfga"], requested_modules(["asdfga"])
-    assert_equal ["asd","fga"], requested_modules(["asd","fga"])
+    tu_assert_equal ["asdfga"], requested_modules(["asdfga"])
+    tu_assert_equal ["asd","fga"], requested_modules(["asd","fga"])
     assert requested_modules([]).empty?
     modules = %w[ldfdl lmzd]
     funits = modules.map{|f| f+'.fun'}.join(' ')
     system "touch "+funits
-    assert_equal modules, requested_modules([])
+    tu_assert_equal modules, requested_modules([])
   end
 
   def test_funit_exists_method
     module_name = "ydsbe"
     File.rm_f(module_name+".fun")
-    assert_equal false, funit_exists?(module_name)
+    tu_assert_equal false, funit_exists?(module_name)
     system "touch "+module_name+".fun"
     assert funit_exists?(module_name)
   end

data/test/test_testsuite.rb

@@ -1,14 +1,19 @@
 require 'test/unit'
 require 'funit/testsuite'
 
+require 'fileutils'
+include FileUtils
+
 class TestTestSuite < Test::Unit::TestCase
 
   def setup
-    File.rm_f(*Dir["dummyf90test*"])
+    files = *Dir["dummyf90test*"]
+    rm_f files if files
   end 
 
   def teardown
-    File.rm_f(*Dir["dummyf90test*"])
+    files = *Dir["dummyf90test*"]
+    rm_f files if files
   end 
 
   def test_nonexistent_funit_file_is_not_created
@@ -53,7 +58,7 @@ class TestTestSuite < Test::Unit::TestCase
   end
 
   def test_single_assert_test_compiles
-    create_funit_file "beginTest assertTrue\nIsTrue(.true.)\nendTest"
+    create_funit_file "beginTest assertTrue\nAssertTrue(.true.)\nendTest"
     Funit::TestSuite.new 'dummyf90test'
     assert system(@@compileCommand)
   end
@@ -63,7 +68,7 @@ class TestTestSuite < Test::Unit::TestCase
  beginTest assertTrue
   integer :: a(2,2)
   a = 1
-  IsEqual(1,a(1,1))
+  AssertEqual(1,a(1,1))
  endTest
     MATRIX
     Funit::TestSuite.new 'dummyf90test'
@@ -75,7 +80,7 @@ class TestTestSuite < Test::Unit::TestCase
  beginTest assert_equals
   real :: real_var
   real_var = 1.0
-  IsRealEqual(1.0,real_var)
+  AssertRealEqual(1.0,real_var)
  endTest
     REALEQUALS
     Funit::TestSuite.new 'dummyf90test'
@@ -85,7 +90,7 @@ class TestTestSuite < Test::Unit::TestCase
   def test_real_equals_assert_works_with_function
     create_funit_file <<-REQUALSFUNC
  beginTest assert_equals_for_function
-  IsRealEqual(0.0,balance(0.0,0.0))
+  AssertRealEqual(0.0,balance(0.0,0.0))
  endTest
  function balance( left, right)
   real :: balance

data/utils/funit-generic-mode.el

@@ -3,18 +3,20 @@
 (define-generic-mode 'funit-generic-mode
    (list ?!)
    (list
-    "beginTest"
-    "endTest"
-    "beginSetup"
-    "endSetup"
-    "beginTeardown"
-    "endTeardown"
+    "test_suite"
+    "end test_suite"
+    "test"
+    "end test"
+    "setup"
+    "end setup"
+    "teardown"
+    "end teardown"
    )
-   '(("\\(IsFalse\\)"		1	'font-lock-function-name-face)
-     ("\\(IsTrue\\)"		1	'font-lock-function-name-face)
-     ("\\(IsEqualWithin\\)"	1	'font-lock-function-name-face)
-     ("\\(IsEqual\\)"		1	'font-lock-function-name-face)
-     ("\\(IsRealEqual\\)"	1	'font-lock-function-name-face))
+   '(("\\(Assert_False\\)"		1	'font-lock-function-name-face)
+     ("\\(Assert_True\\)"		1	'font-lock-function-name-face)
+     ("\\(Assert_Equal_Within\\)"	1	'font-lock-function-name-face)
+     ("\\(Assert_Equal\\)"		1	'font-lock-function-name-face)
+     ("\\(Assert_Real_Equal\\)"	1	'font-lock-function-name-face))
    (list "\\.fun\\'")
    nil
    "Generic mode for fUnit files.")

data/utils/funit-mode.el

@@ -30,17 +30,19 @@
 
 ;; add some new font-locks to f90's extensive list
 (font-lock-add-keywords 'funit-mode
- '(("\\<IsFalse\\>"		. font-lock-function-name-face)
-   ("\\<IsEqual\\>"		. font-lock-function-name-face)
-   ("\\<IsRealEqual\\>"		. font-lock-function-name-face)
-   ("\\<IsTrue\\>"		. font-lock-function-name-face)
-   ("\\<IsEqualWithin\\>"	. font-lock-function-name-face)
-   ("\\<beginTest\\>"		. font-lock-builtin-face)
-   ("\\<endTest\\>"		. font-lock-builtin-face)
-   ("\\<beginTeardown\\>"	. font-lock-builtin-face)
-   ("\\<endTeardown\\>"		. font-lock-builtin-face)
-   ("\\<beginSetup\\>"		. font-lock-builtin-face)
-   ("\\<endSetup\\>"		. font-lock-builtin-face))
+ '(("\\<Assert_False\\>"	. font-lock-function-name-face)
+   ("\\<Assert_Equal\\>"	. font-lock-function-name-face)
+   ("\\<Assert_Real_Equal\\>"	. font-lock-function-name-face)
+   ("\\<Assert_True\\>"		. font-lock-function-name-face)
+   ("\\<Assert_Equal_Within\\>"	. font-lock-function-name-face)
+   ("\\<test_suite\\>"		. font-lock-builtin-face)
+   ("\\<end test_suite\\>"	. font-lock-builtin-face)
+   ("\\<test\\>"		. font-lock-builtin-face)
+   ("\\<end test\\>"		. font-lock-builtin-face)
+   ("\\<teardown\\>"		. font-lock-builtin-face)
+   ("\\<end teardown\\>"	. font-lock-builtin-face)
+   ("\\<setup\\>"		. font-lock-builtin-face)
+   ("\\<end setup\\>"		. font-lock-builtin-face))
 )
 
 (defvar funit-buffer-command "funit"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: funit
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.10.0
 platform: ruby
 authors: 
 - Karen Bibb
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-30 00:00:00 -04:00
+date: 2008-03-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency