fUnit 0.0.3 → 0.1.0

data/tests/tc_compile.rb

@@ -1,4 +1,7 @@
+#! /usr/bin/env ruby
+
 $:.unshift File.join( File.dirname(__FILE__), '..', 'lib' )
+
 require 'test/unit'
 require 'funit/functions'
 
@@ -6,7 +9,7 @@ class TestCompiler < Test::Unit::TestCase
 
  def setup
   @compilerStub = 'dummyCompiler'
-  @oldCompilerName = ENV['F9X']
+  @oldCompilerName = ENV['FC']
  end
 
  def test_explicit_compiler_name
@@ -14,17 +17,17 @@ class TestCompiler < Test::Unit::TestCase
  end
 
  def test_compiler_name_from_environment
-  ENV['F9X'] = @compilerStub
+  ENV['FC'] = @compilerStub
   assert_equal @compilerStub, Funit::Compiler.new.name
  end  
 
  def test_no_environment_compiler_name
-  ENV['F9X'] = nil
+  ENV['FC'] = nil
   assert_raises(RuntimeError) {Funit::Compiler.new}
  end  
 
  def teardown
-   ENV['F9X'] = @oldCompilerName
+   ENV['FC'] = @oldCompilerName
  end
 
 end

data/tests/tc_fortran_deps.rb

@@ -1,4 +1,7 @@
+#! /usr/bin/env ruby
+
 $:.unshift File.join( File.dirname(__FILE__), '..', 'lib' )
+
 require 'test/unit'
 require 'funit/fortran_deps'
 require 'fileutils'

data/tests/tc_funit.rb

@@ -1,4 +1,7 @@
+#! /usr/bin/env ruby
+
 $:.unshift File.join( File.dirname(__FILE__), '..', 'lib' )
+
 require 'test/unit'
 require 'funit'
 require 'ftools'
@@ -8,14 +11,14 @@ class TestFunit < Test::Unit::TestCase
  include Funit
  include Funit::Assertions
 
- def test_main_driver_compiles
+ def Xtest_main_driver_compiles
   writeTestRunner []
   assert File.exists?("TestRunner.f90")
   assert system("#{Compiler.new.name} TestRunner.f90")
   assert File.exists?("a.out")
  end
 
- def test_is_equal
+ def Xtest_is_equal
   @suiteName = "dummy"
   @testName = "dummy"
   @lineNumber = "dummy"
@@ -23,7 +26,7 @@ class TestFunit < Test::Unit::TestCase
   assert_equal '.not.(1.0==m(1,1))', @condition
  end 
 
- def test_is_real_equal
+ def Xtest_is_real_equal
   @suiteName = "dummy"
   @testName = "dummy"
   @lineNumber = "dummy"
@@ -50,10 +53,10 @@ EOF
   File.open('unita.f90','w') do |f|
    f.printf "module unita\n  integer :: a = 5\nend module unita\n"
   end
-  File.open('unitMT.ftk','w') do |f|
-   f.printf "beginTest A\n  IsEqual(5, a)\nendTest\n"
+  File.open('unit.fun','w') do |f|
+   f.printf "beginTest a_gets_set\n  IsEqual(5, a)\nendTest\n"
   end  
-  assert_nothing_raised{runAllFtks}
+  assert_nothing_raised{run_tests}
  end
 
  def test_embedded_dependencies
@@ -66,10 +69,10 @@ EOF
   File.open('unitb.f90','w') do |f|
    f.printf "module unitb\n  integer,parameter :: b = 5\nend module unitb\n"
   end
-  File.open('unitMT.ftk','w') do |f|
-   f.printf "beginTest A\n  IsEqual(5, a)\nendTest\n"
+  File.open('unit.fun','w') do |f|
+   f.printf "beginTest a_gets_set\n  IsEqual(5, a)\nendTest\n"
   end  
-  assert_nothing_raised{runAllFtks}
+  assert_nothing_raised{run_tests}
  end
 
  def test_requested_modules
@@ -77,17 +80,28 @@ EOF
   assert_equal ["asd","fga"], requestedModules(["asd","fga"])
    assert requestedModules([]).empty?
   modules = %w[ldfdl lmzd]
-  ftks = modules.map{|f| f+'MT.ftk'}.join(' ')
-  system "touch "+ftks
+  funits = modules.map{|f| f+'.fun'}.join(' ')
+  system "touch "+funits
   assert_equal modules, requestedModules([])
  end
 
- def test_FTK_exists
+ def test_funit_exists_method
   moduleName = "ydsbe"
-  File.rm_f(moduleName+"MT.ftk")
-  assert_equal false, ftkExists?(moduleName)
-  system "touch "+moduleName+"MT.ftk"
-  assert ftkExists?(moduleName)
+  File.rm_f(moduleName+".fun")
+  assert_equal false, funit_exists?(moduleName)
+  system "touch "+moduleName+".fun"
+  assert funit_exists?(moduleName)
+ end
+
+ def setup
+  File.rm_f(*Dir["dummyunit*"])
+  File.rm_f(*Dir["unit*"])
+  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"])
  end
 
  def teardown

data/tests/tc_test_suite.rb

@@ -1,6 +1,10 @@
+#! /usr/bin/env ruby
+
 $:.unshift File.join( File.dirname(__FILE__), '..', 'lib' )
+
 require 'test/unit'
 require 'funit/test_suite'
+require 'funit/assertions'
 
 class TestTestSuite < Test::Unit::TestCase
 
@@ -8,83 +12,83 @@ class TestTestSuite < Test::Unit::TestCase
   File.rm_f(*Dir["dummyf90test*"])
  end 
 
- def test_nonexistent_FTK_file_is_not_created
+ def teardown
+  File.rm_f(*Dir["dummyf90test*"])
+ end 
+
+ def test_nonexistent_funit_file_is_not_created
   Funit::TestSuite.new 'dummyf90test'
-  assert !File.exists?("dummyf90testMT.ftk")
-  assert !File.exists?("dummyf90testMT.f90")
+  assert !File.exists?("dummyf90test.fun")
+  assert !File.exists?("dummyf90test_fun.f90")
  end
 
- def create_FTK_file ftkContents
+ def create_funit_file funit_contents
   File.open('dummyf90test.f90','w') do |f|
    f.puts "module dummyf90test\nend module dummyf90test"
   end
-  File.open('dummyf90testMT.ftk','w') do |f|
-   f.puts ftkContents
+  File.open('dummyf90test.fun','w') do |f|
+   f.puts funit_contents
   end
  end
 
- @@compileCommand = "#{Funit::Compiler.new.name} -c dummyf90test.f90 dummyf90testMT.f90"
+ @@compileCommand = "#{Funit::Compiler.new.name} -c dummyf90test.f90 dummyf90test_fun.f90"
 
- def test_bare_minimum_FTK_file_compiles
-  create_FTK_file ""
+ def test_bare_minimum_funit_file_compiles
+  create_funit_file ""
   Funit::TestSuite.new 'dummyf90test'
   assert system(@@compileCommand)
  end
 
  def test_module_variables_allowed
-  create_FTK_file "integer :: a"
+  create_funit_file "integer :: a"
   Funit::TestSuite.new 'dummyf90test'
   assert system(@@compileCommand)
  end
 
  def test_blank_setup_compiles
-  create_FTK_file "beginSetup\nendSetup"
+  create_funit_file "beginSetup\nendSetup"
   Funit::TestSuite.new 'dummyf90test'
   assert system(@@compileCommand)
  end
 
  def test_blank_test_gives_warning
-  create_FTK_file "beginTest bob\nendTest"
+  create_funit_file "beginTest bob\nendTest"
   Funit::TestSuite.new 'dummyf90test'
   assert system(@@compileCommand)
  end
 
  def test_single_assert_test_compiles
-  create_FTK_file "beginTest assertTrue\nIsTrue(.true.)\nendTest"
+  create_funit_file "beginTest assertTrue\nIsTrue(.true.)\nendTest"
   Funit::TestSuite.new 'dummyf90test'
   assert system(@@compileCommand)
  end
 
  def test_matrix_assert_compiles
-  create_FTK_file <<-MATFTK
+  create_funit_file <<-MATRIX
  beginTest assertTrue
   integer :: a(2,2)
   a = 1
   IsEqual(a(1,1),1)
  endTest
-  MATFTK
+  MATRIX
   Funit::TestSuite.new 'dummyf90test'
-  puts `cat dummyf90testMT.ftk`
-  puts `cat dummyf90testMT.f90`
   assert system(@@compileCommand)
  end
 
  def test_simple_real_equals_assert_works
-  create_FTK_file <<-REQFTK
+  create_funit_file <<-REALEQUALS
  beginTest assert_equals
   real :: real_var
   real_var = 1.0
   IsRealEqual(real_var,1.0)
  endTest
-  REQFTK
+  REALEQUALS
   Funit::TestSuite.new 'dummyf90test'
-  puts `cat dummyf90testMT.ftk`
-  puts `cat dummyf90testMT.f90`
   assert system(@@compileCommand)
  end
 
  def test_real_equals_assert_works_with_function
-  create_FTK_file <<-REQFTK
+  create_funit_file <<-REQUALSFUNC
   function balance( left, right)
    real :: balance
    real, intent(in) :: left, right
@@ -93,21 +97,15 @@ class TestTestSuite < Test::Unit::TestCase
  beginTest assert_equals_for_function
   IsRealEqual(balance(0.0,0.0),0.0)
  endTest
-  REQFTK
+  REQUALSFUNC
   Funit::TestSuite.new 'dummyf90test'
-  puts `cat dummyf90testMT.ftk`
-  puts `cat dummyf90testMT.f90`
   assert system(@@compileCommand)
  end
 
  def test_ignore_commented_test
-  create_FTK_file "XbeginTest bob\nendTest"
+  create_funit_file "XbeginTest bob\nendTest"
   Funit::TestSuite.new 'dummyf90test'
-  assert_no_match( /Testbob/i, IO.readlines('dummyf90testMT.f90').join )
+  assert_no_match( /Testbob/i, IO.readlines('dummyf90test_fun.f90').join )
  end
 
- def teardown
-  File.rm_f(*Dir["dummyf90test*"])
- end 
-
 end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: fUnit
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.1.0
 date: 2006-04-15 00:00:00 -04:00
 summary: A Fortran Unit Testing Framework
 require_paths: 
@@ -87,25 +87,12 @@ files:
   - examples/CFD
   - examples/StopWatch
   - examples/CFD/FluxFunctions.f90
-  - examples/CFD/fluxfunctions.mod
-  - examples/CFD/FluxFunctionsMT.f90
-  - examples/CFD/FluxFunctionsMT.ftk
+  - examples/CFD/FluxFunctions.fun
   - 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/CFD/GasModel.fun
   - 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
+  - examples/StopWatch/StopWatch.fun
   - lib/funit
   - lib/funit.rb
   - lib/funit/assertions.rb

data/examples/CFD/FluxFunctionsMT.f90

@@ -1,336 +0,0 @@
-! FluxFunctionsMT.f90 - a Fortran mobility test suite for FluxFunctions.f90
-!
-! [dynamically generated from FluxFunctionsMT.ftk
-!  by funit Ruby script Sun Apr 09 01:22:59 EDT 2006]
-
-module FluxFunctionsMT
-
- use FluxFunctions
-
- implicit none
-
- private
-
- public :: MTFluxFunctions
-
- logical :: noAssertFailed
-
- integer :: numTests          = 0
- integer :: numAsserts        = 0
- integer :: numAssertsTested  = 0
- integer :: numFailures       = 0
-
-! $Id: FluxFunctionsMT.ftk 139 2006-04-09 05:17:47Z kleb $
-
- real :: leftState, rightState, interfaceFlux
-
- contains
-
-
- subroutine TestFluxZero
-
-  real :: state
-  state = 0
-
-  ! IsEqualWithin assertion
-  numAsserts = numAsserts + 1
-  if (noAssertFailed) then
-    if (.not.( 0+ 0.00001 .ge. Flux(state) &
-             .and. 0- 0.00001 .le. Flux(state))) then
-      print *, " *IsEqualWithin failed* in test FluxZero &
-                         &[FluxFunctionsMT.ftk:13]"
-      print *, "  ", " Flux(state) (", Flux(state),") is not", 0,"within", 0.00001 
-      print *, ""
-      noAssertFailed = .false.
-      numFailures    = numFailures + 1
-    else
-      numAssertsTested = numAssertsTested + 1
-    endif
-  endif
-
-  numTests = numTests + 1
-
- end subroutine TestFluxZero
-
- 
- subroutine TestFluxOne
-
-  real :: state = 1
-
-  ! IsEqualWithin assertion
-  numAsserts = numAsserts + 1
-  if (noAssertFailed) then
-    if (.not.( 0.5+ 0.00001 .ge. Flux(state) &
-             .and. 0.5- 0.00001 .le. Flux(state))) then
-      print *, " *IsEqualWithin failed* in test FluxOne &
-                         &[FluxFunctionsMT.ftk:18]"
-      print *, "  ", " Flux(state) (", Flux(state),") is not", 0.5,"within", 0.00001 
-      print *, ""
-      noAssertFailed = .false.
-      numFailures    = numFailures + 1
-    else
-      numAssertsTested = numAssertsTested + 1
-    endif
-  endif
-
-  numTests = numTests + 1
-
- end subroutine TestFluxOne
-
-
- subroutine TestRoeAvgZero
-
-
-  ! IsRealEqual assertion
-  numAsserts = numAsserts + 1
-  if (noAssertFailed) then
-    if (.not.( RoeAvg(0.0+2*spacing(real( RoeAvg(0.0)).ge.0.0), 0  &
-             .and. RoeAvg(0.0-2*spacing(real( RoeAvg(0.0)).le.0.0), 0 )) then
-      print *, " *IsRealEqual failed* in test RoeAvgZero &
-                         &[FluxFunctionsMT.ftk:22]"
-      print *, "  ", "0.0), 0  (",0.0), 0 ,") is not", RoeAvg(0.0,"within",2*spacing(real( RoeAvg(0.0))
-      print *, ""
-      noAssertFailed = .false.
-      numFailures    = numFailures + 1
-    else
-      numAssertsTested = numAssertsTested + 1
-    endif
-  endif
-
-  ! IsFalse assertion
-  numAsserts = numAsserts + 1
-  if (noAssertFailed) then
-    if ( RoeAvg(0.0,0.0).ne.1 ) then
-      print *, " *IsFalse failed* in test RoeAvgZero &
-                         &[FluxFunctionsMT.ftk:23]"
-      print *, "  ", " RoeAvg(0.0,0.0).ne.1  is not false"
-      print *, ""
-      noAssertFailed = .false.
-      numFailures    = numFailures + 1
-    else
-      numAssertsTested = numAssertsTested + 1
-    endif
-  endif
-
-  numTests = numTests + 1
-
- end subroutine TestRoeAvgZero
-
-
- subroutine TestRoeAvgKnown
-
-
-  ! IsRealEqual assertion
-  numAsserts = numAsserts + 1
-  if (noAssertFailed) then
-    if (.not.( RoeAvg(leftState+2*spacing(real( RoeAvg(leftState)).ge.rightState), 0.5  &
-             .and. RoeAvg(leftState-2*spacing(real( RoeAvg(leftState)).le.rightState), 0.5 )) then
-      print *, " *IsRealEqual failed* in test RoeAvgKnown &
-                         &[FluxFunctionsMT.ftk:27]"
-      print *, "  ", "rightState), 0.5  (",rightState), 0.5 ,") is not", RoeAvg(leftState,"within",2*spacing(real( RoeAvg(leftState))
-      print *, ""
-      noAssertFailed = .false.
-      numFailures    = numFailures + 1
-    else
-      numAssertsTested = numAssertsTested + 1
-    endif
-  endif
-
-  ! IsTrue assertion
-  numAsserts = numAsserts + 1
-  if (noAssertFailed) then
-    if (.not.( RoeAvg(leftState,rightState).lt.0 )) then
-      print *, " *IsTrue failed* in test RoeAvgKnown &
-                         &[FluxFunctionsMT.ftk:28]"
-      print *, "  ", " RoeAvg(leftState,rightState).lt.0  is not true"
-      print *, ""
-      noAssertFailed = .false.
-      numFailures    = numFailures + 1
-    else
-      numAssertsTested = numAssertsTested + 1
-    endif
-  endif
-
-  numTests = numTests + 1
-
- end subroutine TestRoeAvgKnown
-
-
- subroutine TestCentralFluxKnown
-
-  call CentralFlux( leftState, rightState, interfaceFlux )
-
-  ! IsEqualWithin assertion
-  numAsserts = numAsserts + 1
-  if (noAssertFailed) then
-    if (.not.( 0.5+ 0.001 .ge. interfaceFlux &
-             .and. 0.5- 0.001 .le. interfaceFlux)) then
-      print *, " *IsEqualWithin failed* in test CentralFluxKnown &
-                         &[FluxFunctionsMT.ftk:33]"
-      print *, "  ", " interfaceFlux (", interfaceFlux,") is not", 0.5,"within", 0.001 
-      print *, ""
-      noAssertFailed = .false.
-      numFailures    = numFailures + 1
-    else
-      numAssertsTested = numAssertsTested + 1
-    endif
-  endif
-
-  ! IsEqualWithin assertion
-  numAsserts = numAsserts + 1
-  if (noAssertFailed) then
-    if (.not.( 0.5+ 0.00000001 .ge. interfaceFlux &
-             .and. 0.5- 0.00000001 .le. interfaceFlux)) then
-      print *, " *IsEqualWithin failed* in test CentralFluxKnown &
-                         &[FluxFunctionsMT.ftk:34]"
-      print *, "  ", " interfaceFlux (", interfaceFlux,") is not", 0.5,"within", 0.00000001 
-      print *, ""
-      noAssertFailed = .false.
-      numFailures    = numFailures + 1
-    else
-      numAssertsTested = numAssertsTested + 1
-    endif
-  endif
-
-  ! IsEqual assertion
-  numAsserts = numAsserts + 1
-  if (noAssertFailed) then
-    if (.not.( interfaceFlux== 0.5 )) then
-      print *, " *IsEqual failed* in test CentralFluxKnown &
-                         &[FluxFunctionsMT.ftk:35]"
-      print *, "  ", " interfaceFlux (", interfaceFlux,") is not",  0.5 
-      print *, ""
-      noAssertFailed = .false.
-      numFailures    = numFailures + 1
-    else
-      numAssertsTested = numAssertsTested + 1
-    endif
-  endif
-
-  numTests = numTests + 1
-
- end subroutine TestCentralFluxKnown
-
-
- subroutine TestRoeFluxExpansionShock
-
-  leftState = -1
-  call RoeFlux( leftState, rightState, interfaceFlux )
-
-  ! IsEqual assertion
-  numAsserts = numAsserts + 1
-  if (noAssertFailed) then
-    if (.not.( interfaceFlux== 0 )) then
-      print *, " *IsEqual failed* in test RoeFluxExpansionShock &
-                         &[FluxFunctionsMT.ftk:41]"
-      print *, "  ", " interfaceFlux (", interfaceFlux,") is not",  0 
-      print *, ""
-      noAssertFailed = .false.
-      numFailures    = numFailures + 1
-    else
-      numAssertsTested = numAssertsTested + 1
-    endif
-  endif
-
-  numTests = numTests + 1
-
- end subroutine TestRoeFluxExpansionShock
-
-
- subroutine TestRoeFluxZero
-
-  rightState = 0
-  call RoeFlux( leftState, rightState, interfaceFlux )
-
-  ! IsRealEqual assertion
-  numAsserts = numAsserts + 1
-  if (noAssertFailed) then
-    if (.not.( interfaceFlux+2*spacing(real( interfaceFlux)).ge. 0  &
-             .and. interfaceFlux-2*spacing(real( interfaceFlux)).le. 0 )) then
-      print *, " *IsRealEqual failed* in test RoeFluxZero &
-                         &[FluxFunctionsMT.ftk:47]"
-      print *, "  ", " 0  (", 0 ,") is not", interfaceFlux,"within",2*spacing(real( interfaceFlux))
-      print *, ""
-      noAssertFailed = .false.
-      numFailures    = numFailures + 1
-    else
-      numAssertsTested = numAssertsTested + 1
-    endif
-  endif
-
-  ! IsEqual assertion
-  numAsserts = numAsserts + 1
-  if (noAssertFailed) then
-    if (.not.( interfaceFlux== 0 )) then
-      print *, " *IsEqual failed* in test RoeFluxZero &
-                         &[FluxFunctionsMT.ftk:48]"
-      print *, "  ", " interfaceFlux (", interfaceFlux,") is not",  0 
-      print *, ""
-      noAssertFailed = .false.
-      numFailures    = numFailures + 1
-    else
-      numAssertsTested = numAssertsTested + 1
-    endif
-  endif
-
-  numTests = numTests + 1
-
- end subroutine TestRoeFluxZero
-
-
- subroutine Setup
-  leftState  = 0
-  rightState = 1
-  noAssertFailed = .true.
- end subroutine Setup
-
-
- subroutine Teardown
- end subroutine Teardown
-
-
- subroutine MTFluxFunctions( nTests, nAsserts, nAssertsTested, nFailures )
-
-  integer :: nTests
-  integer :: nAsserts
-  integer :: nAssertsTested
-  integer :: nFailures
-
-  continue
-
-  call Setup
-  call TestFluxZero
-  call Teardown
-
-  call Setup
-  call TestFluxOne
-  call Teardown
-
-  call Setup
-  call TestRoeAvgZero
-  call Teardown
-
-  call Setup
-  call TestRoeAvgKnown
-  call Teardown
-
-  call Setup
-  call TestCentralFluxKnown
-  call Teardown
-
-  call Setup
-  call TestRoeFluxExpansionShock
-  call Teardown
-
-  call Setup
-  call TestRoeFluxZero
-  call Teardown
-
-  nTests          = numTests
-  nAsserts        = numAsserts
-  nAssertsTested  = numAssertsTested
-  nFailures       = numFailures
-
- end subroutine MTFluxFunctions
-
-end module FluxFunctionsMT