fUnit 0.0.1 → 0.0.2

data/examples/StopWatch/StopWatchMT.ftk

@@ -0,0 +1,73 @@
+integer, dimension(8) :: dateAndTime1, dateAndTime2
+real :: seconds
+
+beginSetup
+  NotInitialized = .TRUE.
+  last    = 0
+  seconds = HUGE(0.0)
+endSetup
+
+beginTest SystemDateAndTimeWorks
+ call date_and_time(values=dateAndTime1)
+ IsTrue( dateAndTime1(1) /= -huge(0) )
+ IsTrue( size(dateAndTime1,1) == 8 )
+endTest
+
+! test secBetween
+beginTest OneMSecDifference
+  dateAndTime1 = (/ 2000, 1, 1, 0, 0, 0, 0, 0 /)
+  dateAndTime2 = (/ 2000, 1, 1, 0, 0, 0, 0, 1 /)
+  seconds = SecBetween(dateAndTime1, dateAndTime2)
+  IsRealEqual(seconds, 0.001)
+endTest
+
+beginTest MinuteRollover
+  dateAndTime1 = (/ 2000, 1, 1, 0, 0, 0,59, 0 /)
+  dateAndTime2 = (/ 2000, 1, 1, 0, 0, 1, 0, 0 /)
+  seconds = SecBetween(dateAndTime1, dateAndTime2)
+  IsRealEqual(seconds, 1.0)
+endTest
+
+! test secSinceLast
+beginTest InitializationState
+  IsTrue(notInitialized)
+  seconds = secSinceLast()
+  IsFalse(notInitialized)
+  seconds = secSinceLast()
+  IsFalse(notInitialized)
+endTest
+
+beginTest InitiallyReturnsZero
+  seconds = secSinceLast()
+  IsRealEqual(seconds, 0.0)
+  call timeDelay(seconds)
+  seconds = secSinceLast()
+  IsTrue( seconds /= 0.0 )
+endTest
+
+subroutine timeDelay (sum)
+  integer :: i
+  real    :: sum
+  do i = 1, 1000000
+   sum = sum + i
+  enddo
+end subroutine timeDelay
+
+beginTest ComputesSeconds
+  seconds = secSinceLast()
+  call timeDelay (seconds)
+  seconds = secSinceLast()
+  IsTrue( seconds > 0.0 )
+endTest
+
+beginTest ComputesSecondsSpecial
+  real :: expectedSeconds
+
+  seconds = secSinceLast()
+  dateAndTime1 = last
+  call timeDelay (seconds)
+  seconds = secSinceLast()
+  dateAndTime2 = last
+  expectedSeconds = secBetween(dateAndTime1,dateAndTime2)
+  IsRealEqual(seconds, expectedSeconds)
+endTest

data/examples/StopWatch/TestRunner.f90

@@ -0,0 +1,23 @@
+! TestRunner.f90 - runs Fortran mobility test suites
+!
+! [Dynamically generated by funit Ruby script Sun Apr 09 01:07:09 EDT 2006.]
+
+program TestRunner
+
+ use StopWatchMT
+
+ implicit none
+
+ integer :: numTests, numAsserts, numAssertsTested, numFailures
+
+ print *, ""
+ print *, "StopWatch test suite:"
+ call MTStopWatch( numTests, &
+        numAsserts, numAssertsTested, numFailures )
+ print *, "Passed", numAssertsTested, "of", numAsserts, &
+          "possible asserts comprising", &
+           numTests-numFailures, "of", numTests, "tests." 
+
+ print *, ""
+
+end program TestRunner

data/examples/StopWatch/stopwatch.mod

@@ -0,0 +1,34 @@
+G95 module created on Sun Apr  9 01:07:09 2006 from ./StopWatch.f90
+If you edit this, you'll get what you deserve.
+
+(() () () () () () () () () () () () () () () () () () () () ())
+
+()
+
+()
+
+()
+
+()
+
+(2 'secbetween' 'stopwatch' 1 ((PROCEDURE UNKNOWN MODULE-PROC DECL
+FUNCTION) (REAL 4 ()) 0 0 (3 NONE 4 NONE) () '' () ())
+5 'secsincelast' 'stopwatch' 1 ((PROCEDURE UNKNOWN MODULE-PROC DECL
+FUNCTION) (REAL 4 ()) 0 0 () () '' () ())
+6 'stopwatch' 'stopwatch' 1 ((MODULE UNKNOWN UNKNOWN UNKNOWN) (UNKNOWN 0
+()) 0 0 () () '' () ())
+7 'notinitialized' 'stopwatch' 1 ((VARIABLE UNKNOWN UNKNOWN UNKNOWN) (
+LOGICAL 4 ()) 0 0 () () '' () ())
+8 'last' 'stopwatch' 1 ((VARIABLE UNKNOWN UNKNOWN UNKNOWN DIMENSION) (
+INTEGER 4 ()) 0 0 () (1 EXPLICIT (CONSTANT (INTEGER 4 ()) 0 '1') (
+CONSTANT (INTEGER 4 ()) 0 '8')) '' () ())
+3 'begindnt' '' 9 ((VARIABLE IN UNKNOWN UNKNOWN DIMENSION DUMMY) (
+INTEGER 4 ()) 0 0 () (1 EXPLICIT (CONSTANT (INTEGER 4 ()) 0 '1') (
+CONSTANT (INTEGER 4 ()) 0 '8')) '' () ())
+4 'enddnt' '' 9 ((VARIABLE IN UNKNOWN UNKNOWN DIMENSION DUMMY) (INTEGER
+4 ()) 0 0 () (1 EXPLICIT (CONSTANT (INTEGER 4 ()) 0 '1') (CONSTANT (
+INTEGER 4 ()) 0 '8')) '' () ())
+)
+
+('last' 0 8 'notinitialized' 0 7 'stopwatch' 0 6 'secsincelast' 0 5
+'secbetween' 0 2)

data/examples/StopWatch/stopwatchmt.mod

@@ -0,0 +1,27 @@
+G95 module created on Sun Apr  9 01:07:09 2006 from ./StopWatchMT.f90
+If you edit this, you'll get what you deserve.
+
+(() () () () () () () () () () () () () () () () () () () () ())
+
+()
+
+()
+
+()
+
+()
+
+(2 'mtstopwatch' 'stopwatchmt' 1 ((PROCEDURE UNKNOWN MODULE-PROC DECL
+SUBROUTINE) (PROCEDURE 0 ()) 0 0 (3 NONE 4 NONE 5 NONE 6 NONE) () '' ()
+())
+3 'ntests' '' 7 ((VARIABLE UNKNOWN UNKNOWN UNKNOWN DUMMY) (INTEGER 4 ())
+0 0 () () '' () ())
+4 'nasserts' '' 7 ((VARIABLE UNKNOWN UNKNOWN UNKNOWN DUMMY) (INTEGER 4 ())
+0 0 () () '' () ())
+6 'nfailures' '' 7 ((VARIABLE UNKNOWN UNKNOWN UNKNOWN DUMMY) (INTEGER 4
+()) 0 0 () () '' () ())
+5 'nassertstested' '' 7 ((VARIABLE UNKNOWN UNKNOWN UNKNOWN DUMMY) (
+INTEGER 4 ()) 0 0 () () '' () ())
+)
+
+('mtstopwatch' 0 2)

data/lib/funit.rb

@@ -1,17 +1,14 @@
 require 'funit/functions'
+require 'funit/fortran_deps'
 require 'funit/assertions'
 require 'funit/test_suite'
 
 module Funit
-
   def runAllFtks
-
     Compiler.new # a test for compiler env set (remove this later)
-
     writeTestRunner(testSuites = parseCommandLine)
 
     # convert each *MT.ftk file into a pure Fortran9x file:
-
     testSuites.each do |testSuite|
       testSuiteF90 = TestSuite.new(testSuite)
     end
@@ -19,7 +16,5 @@ module Funit
     compileTests testSuites
 
     raise "Failed to execute TestRunner" unless system("./TestRunner")
- 
   end
-
 end

data/lib/funit/fortran_deps.rb

@@ -0,0 +1,112 @@
+# This scripts finds dependencies for f90 code
+
+raise "Need Ruby version >= 1.8, current using #{VERSION}" unless String.instance_methods.include? "match"
+
+module Funit
+
+  class Depend
+
+    attr_reader :file_dependencies, :source_files
+
+    def initialize( searchPath = %w[ ../lib . ] )
+      @parsed = Array.new
+      @hash = build_hash_of_modules_in_files_within searchPath
+      @file_dependencies = Hash.new
+      @source_files = Array.new
+    end
+
+    def modules_used_in( file )
+      modules = IO.readlines( file ).map do |line|
+        $1.downcase if line.match( /^\s*use\s+(\w+)/i )
+      end.uniq.compact
+    end
+
+    def modules_defined_in( file )
+      modules = IO.readlines( file ).map do |line| 
+        $1.downcase if line.match( /^\s*module\s+(\w+)/i )
+      end.uniq.compact
+    end
+
+    def build_dictionary_of_modules_in( files )
+      file_containing_module = Hash.new
+      files.each do |file|
+        modules_defined_in( file ).each{ |mod| file_containing_module[mod]=file }
+      end
+      file_containing_module
+    end
+
+    def fortran_files_within( search_path = %w[ ../lib . ] )
+      source = search_path.map{ |path| Dir[path+"/*.[fF]90"] }
+      source.flatten!.uniq!
+      source.delete_if{ |file| File.lstat(file).symlink? }
+      source.delete_if{ |file| file.match(/lmpi_module_template.F90/) }
+    end
+
+    def build_hash_of_modules_in_files_within( searchPath = %w[../lib .] )
+      build_dictionary_of_modules_in( fortran_files_within( searchPath ) )
+    end
+
+    def makefile_dependency_line( source )
+      realSource = source.sub(/PHYSICS_DUMMY/,'PHYSICS_MODULES')# What's this?
+      sourceNoPath = File.basename source
+      @source_files.push sourceNoPath.gsub(%r|^.*/|,'')
+      output = ''
+      if (File.expand_path(source) != File.expand_path(sourceNoPath))
+        output += sourceNoPath+ ": " + realSource + "\n"
+        output += "\tln -sf "+realSource+" .\n"
+      end
+      output += source.gsub(/\.(f|F)90$/, ".o").gsub(%r|^.*/|,"" ) +
+                ": " + source.gsub(%r|^.*/|,"" ) 
+      modules_used_in( source ).each do |use|
+        unless @hash[use]
+          unless ( use=~/f90_unix/ || use=~/nas_system/ )
+            $stderr.puts "Warning: unable to locate module #{use} used in #{source}." if $DEBUG
+          end
+          next
+        end
+        output = output + " \\\n " +
+                 @hash[use].gsub(/\.(f|F)90$/, ".o").gsub(%r|^.*/|,"" )
+      end
+      output+"\n"
+    end
+
+    def dependencies( start )
+      modules = modules_used_in( start )
+      @parsed = @parsed || [start]
+      newSourceFiles = modules.collect{ |mod| @hash[mod] }.compact
+      makefile_dependency_line(start) +
+      newSourceFiles.collect do |file|
+        next if @parsed.include?(file)
+        @parsed.push file
+        dependencies file
+      end.to_s
+    end
+
+    def source_file_dependencies( head_f90 )
+      modules_head_uses = modules_used_in( head_f90 )
+      required_f90s = modules_head_uses.map{ |mod| @hash[mod] }.compact
+      @file_dependencies[head_f90] = required_f90s
+      required_f90s.each do |required_f90|
+        next if @parsed.include?(required_f90)
+        source_file_dependencies( required_f90 )
+      end
+      @parsed.push head_f90
+    end
+
+    def required_source_files( head_f90 )
+      @parsed.clear
+      source_file_dependencies( head_f90 )
+      sources = Array.new
+      while !@file_dependencies.empty? do
+        no_dependents_pair = @file_dependencies.detect{ |h,d| d == [] }
+        no_dependents = no_dependents_pair.first
+        sources.push no_dependents
+        @file_dependencies.delete(no_dependents){ |el| "#{el} not found" }
+        @file_dependencies.each_value{ |deps| deps.delete(no_dependents) }
+      end
+      sources
+    end
+
+  end # class
+
+end # module

data/lib/funit/functions.rb

@@ -17,7 +17,7 @@ Fortran compiler environment variable 'F9X' not set:
       raise(errorMessage) unless @name = name
     end
 
-  end
+  end # class
 
   def requestedModules(moduleNames)
     if (moduleNames.empty?)
@@ -104,8 +104,6 @@ program TestRunner
   end
 
   def compileTests testSuites
-    require 'fortran_deps'
-
     puts "computing dependencies"
     dependencies = Depend.new(['.', '../LibF90', '../PHYSICS_DEPS'])
     puts "locating associated source files and sorting for compilation"
@@ -114,11 +112,10 @@ program TestRunner
     puts compile = "#{ENV['F9X']} #{ENV['F9X_LDFLAGS']} -o TestRunner \\\n  #{requiredSources.join(" \\\n  ")}"
 
     raise "Compile failed." unless system(compile)
-
   end
 
   # set some regular expressions:
   $keyword = /(begin|end)(Setup|Teardown|Test)|Is(RealEqual|Equal|False|True|EqualWithin)\(.*\)/i
   $commentLine = /^\s*!/
 
-end # module Funit
+end # module

data/tests/tc_fortran_deps.rb

@@ -1,6 +1,6 @@
 $:.unshift File.join( File.dirname(__FILE__), '..', 'lib' )
 require 'test/unit'
-require 'fortran_deps'
+require 'funit/fortran_deps'
 require 'fileutils'
 
 class TestFortranDeps < Test::Unit::TestCase
@@ -30,7 +30,7 @@ class TestFortranDeps < Test::Unit::TestCase
   File.open('externalUse.f90','w') do |f|
    f.puts "program user\nuse cantFindModule\nend program"
   end
-  @dep = Depend.new
+  @dep = Funit::Depend.new
  end
 
  def test_finds_which_modules_a_source_file_uses

metadata

@@ -3,15 +3,18 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: fUnit
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2006-04-05 00:00:00 -04:00
+  version: 0.0.2
+date: 2006-04-09 00:00:00 -04:00
 summary: A Fortran Unit Testing Framework
 require_paths: 
   - lib
 email: funit-support@rubyforge.org
 homepage: http://funit.rubyforge.org/
 rubyforge_project: funit
-description: 
+description: "FUnit is a unit testing framework for Fortran modules. Unit tests are written in
+  Fortran fragments that use a small set of testing-specific extensions.  FUnit
+  transforms these fragments into valid Fortran code and compiles, links, and runs
+  them against the module under test."
 autorequire: funit
 default_executable: 
 bindir: bin
@@ -29,23 +32,37 @@ cert_chain:
 authors: 
   - fUnit Team
 files: 
+  - COPYING
+  - Rakefile
+  - README
   - bin/funit
-  - tests/tc_compile.rb
-  - tests/tc_fortran_deps.rb
-  - tests/tc_funit.rb
-  - tests/tc_test_suite.rb
-  - tests/ts_funit.rb
-  - lib/clean
-  - lib/fortran_deps.rb
-  - lib/funit
-  - lib/funit.rb
-  - lib/mklinks
-  - lib/funit/assertions.rb
-  - lib/funit/functions.rb
-  - lib/funit/test_suite.rb
   - docs/HISTORY
+  - docs/html
   - docs/spiel
   - docs/why
+  - docs/html/classes
+  - docs/html/created.rid
+  - docs/html/files
+  - docs/html/fr_class_index.html
+  - docs/html/fr_file_index.html
+  - docs/html/fr_method_index.html
+  - docs/html/index.html
+  - docs/html/rdoc-style.css
+  - docs/html/classes/Funit
+  - docs/html/classes/Funit.html
+  - docs/html/classes/Funit/Assertions.html
+  - docs/html/classes/Funit/Compiler.html
+  - docs/html/classes/Funit/Depend.html
+  - docs/html/classes/Funit/TestSuite.html
+  - docs/html/files/COPYING.html
+  - docs/html/files/lib
+  - docs/html/files/README.html
+  - docs/html/files/lib/funit
+  - docs/html/files/lib/funit_rb.html
+  - docs/html/files/lib/funit/assertions_rb.html
+  - docs/html/files/lib/funit/fortran_deps_rb.html
+  - docs/html/files/lib/funit/functions_rb.html
+  - docs/html/files/lib/funit/test_suite_rb.html
   - docs/spiel/slides.tex
   - docs/why/F90testRun
   - docs/why/F90testRun.ps
@@ -68,16 +85,50 @@ files:
   - docs/why/portrait
   - docs/why/TestRunner.f90
   - docs/why/TestRunner.f90.ps
-  - README
-  - LICENSE
-  - INSTALL
+  - examples/CFD
+  - examples/StopWatch
+  - examples/CFD/FluxFunctions.f90
+  - examples/CFD/fluxfunctions.mod
+  - examples/CFD/FluxFunctionsMT.f90
+  - examples/CFD/FluxFunctionsMT.ftk
+  - examples/CFD/Gammas.f90
+  - examples/CFD/gammas.mod
+  - examples/CFD/GasModel.f90
+  - examples/CFD/gasmodel.mod
+  - examples/CFD/GasModelMT.f90
+  - examples/CFD/GasModelMT.ftk
+  - examples/CFD/gasmodelmt.mod
+  - examples/CFD/TestRunner
+  - examples/CFD/TestRunner.f90
+  - examples/StopWatch/StopWatch.f90
+  - examples/StopWatch/stopwatch.mod
+  - examples/StopWatch/StopWatchMT.f90
+  - examples/StopWatch/StopWatchMT.ftk
+  - examples/StopWatch/stopwatchmt.mod
+  - examples/StopWatch/TestRunner
+  - examples/StopWatch/TestRunner.f90
+  - lib/clean
+  - lib/funit
+  - lib/funit.rb
+  - lib/mklinks
+  - lib/funit/assertions.rb
+  - lib/funit/fortran_deps.rb
+  - lib/funit/functions.rb
+  - lib/funit/test_suite.rb
+  - tests/tc_compile.rb
+  - tests/tc_fortran_deps.rb
+  - tests/tc_funit.rb
+  - tests/tc_test_suite.rb
+  - tests/ts_funit.rb
 test_files: 
   - tests/ts_funit.rb
-rdoc_options: []
+rdoc_options: 
+  - "--inline-source"
+  - "--main"
+  - README
 extra_rdoc_files: 
   - README
-  - LICENSE
-  - INSTALL
+  - COPYING
 executables: 
   - funit
 extensions: []