fUnit 0.1.0 → 0.1.1

data/tests/tc_fortran_deps.rb

@@ -8,95 +8,105 @@ require 'fileutils'
 
 class TestFortranDeps < Test::Unit::TestCase
 
- def setup
-  Dir.mkdir 'DependenciesFixture'
-  Dir.chdir 'DependenciesFixture'
-  Dir.mkdir 'lib'
-  Dir.chdir 'lib'
-  File.open('solution.f90','w') do |f|
-   f.puts "module solution\nuse area\nend module solution"
+  def setup
+    Dir.mkdir 'DependenciesFixture'
+    Dir.chdir 'DependenciesFixture'
+    Dir.mkdir 'lib'
+    Dir.chdir 'lib'
+    File.open('solution.f90','w') do |f|
+      f.puts "module solution\nuse area\nend module solution"
+    end
+    Dir.chdir '..'
+    Dir.mkdir 'src'
+    Dir.chdir 'src'
+    File.open('main.F90','w') do |f|
+      f.puts 'program whizzard'
+      f.puts " use grid\n use solution\n use circle"
+      f.puts 'end program whizzard'
+    end
+    File.open('grid.f90','w') do |f|
+      f.puts "module grid\nuse area\nend module grid"
+    end
+    File.open('shapes.f90','w') do |f|
+      f.puts "module rectangle_fun3d\nend module rectangle_fun3d"
+      f.puts "module circle\n use area\nend module circle"
+    end
+    File.open('area.f90','w'){ |f| f.puts "module area\nend module area" }
+    File.open('externalUse.f90','w') do |f|
+      f.puts "program user\nuse cantFindModule\nend program"
+    end
+    @dep = Funit::Depend.new
   end
-  Dir.chdir '..'
-  Dir.mkdir 'src'
-  Dir.chdir 'src'
-  File.open('main.F90','w') do |f|
-   f.puts 'program whizzard'
-   f.puts " use grid\n use solution\n use circle"
-   f.puts 'end program whizzard'
+
+  def teardown
+    Dir.chdir '../..'
+    FileUtils.rm_rf 'DependenciesFixture'
+  end
+
+  def test_finds_which_modules_a_source_file_uses
+    assert_equal %w[grid solution circle], @dep.modules_used_in( 'main.F90' )
   end
-  File.open('grid.f90','w'){ |f| f.puts "module grid\nuse area\nend module grid" }
-  File.open('shapes.f90','w') do |f|
-   f.puts "module rectangle_fun3d\nend module rectangle_fun3d"
-   f.puts "module circle\n use area\nend module circle"
+
+  def test_finds_modules_defined_in_source_file
+    assert_equal %w[rectangle_fun3d circle],
+                 @dep.modules_defined_in( 'shapes.f90' )
   end
-  File.open('area.f90','w'){ |f| f.puts "module area\nend module area" }
-  File.open('externalUse.f90','w') do |f|
-   f.puts "program user\nuse cantFindModule\nend program"
+
+  def test_create_module_definition_hash
+    assert_equal %w[circle rectangle_fun3d],
+    @dep.build_dictionary_of_modules_in( 'shapes.f90' ).keys.sort
   end
-  @dep = Funit::Depend.new
- end
-
- def test_finds_which_modules_a_source_file_uses
-  assert_equal %w[grid solution circle], @dep.modules_used_in( 'main.F90' )
- end
-
- def test_finds_modules_defined_in_source_file
-  assert_equal %w[rectangle_fun3d circle], @dep.modules_defined_in( 'shapes.f90' )
- end
-
- def test_create_module_definition_hash
-  assert_equal %w[circle rectangle_fun3d],
-               @dep.build_dictionary_of_modules_in( 'shapes.f90' ).keys.sort
- end
-
- def test_locating_all_fortran_files_in_search_path
-  files = %w[ ../lib/solution.f90 ./area.f90 ./externalUse.f90
-              ./grid.f90 ./main.F90 ./shapes.f90 ]
-  @dep.fortran_files_within.each do |file|
-   assert files.include?(file)
+
+  def test_locating_all_fortran_files_in_search_path
+    files = %w[ ../lib/solution.f90 ./area.f90 ./externalUse.f90
+                ./grid.f90 ./main.F90 ./shapes.f90 ]
+    @dep.fortran_files_within.each do |file|
+      assert files.include?(file)
+    end
   end
- end
-
- def test_build_hash_with_source_files
-  f90 = %w[./grid.f90 ../lib/solution.f90 ./shapes.f90 ./area.f90]
-  hash = @dep.build_dictionary_of_modules_in( f90 )
-  assert_equal \
-   %w[./shapes.f90 ./shapes.f90 ./area.f90 ../lib/solution.f90 ./grid.f90].sort,
-   hash.values.sort
-  assert_equal %w[rectangle_fun3d circle area solution grid].sort, hash.keys.sort
-  assert_equal hash , @dep.build_hash_of_modules_in_files_within
- end
-
- def test_dependency_generation_elements
-  directoryHash = @dep.build_hash_of_modules_in_files_within
-
-  sourceFile = "main.F90"
-  modules = @dep.modules_used_in( sourceFile )
-  assert_equal %w[grid solution circle], modules
-  
-  newSourceFiles = modules.collect{ |mod| directoryHash[mod] }
-  assert_equal %w[./grid.f90 ../lib/solution.f90 ./shapes.f90], newSourceFiles
-  
-  newModules = newSourceFiles.collect do |file|
-   @dep.modules_used_in( file )
-  end.flatten.uniq
-
-  assert_equal ["area"], newModules
- end
-
- def test_makefile_dependency_line_generation
-  sourceFile = "main.F90"
-  makeGolden=String.new <<-GOLDEN
+
+  def test_build_hash_with_source_files
+    f90 = %w[./grid.f90 ../lib/solution.f90 ./shapes.f90 ./area.f90]
+    hash = @dep.build_dictionary_of_modules_in( f90 )
+    assert_equal %w[ ./shapes.f90 ./shapes.f90 ./area.f90
+                     ../lib/solution.f90 ./grid.f90 ].sort,
+                 hash.values.sort
+    assert_equal %w[ rectangle_fun3d circle area solution grid ].sort,
+                 hash.keys.sort
+    assert_equal hash , @dep.build_hash_of_modules_in_files_within
+  end
+
+  def test_dependency_generation_elements
+    directoryHash = @dep.build_hash_of_modules_in_files_within
+
+    sourceFile = "main.F90"
+    modules = @dep.modules_used_in( sourceFile )
+    assert_equal %w[grid solution circle], modules
+    
+    newSourceFiles = modules.collect{ |mod| directoryHash[mod] }
+    assert_equal %w[ ./grid.f90 ../lib/solution.f90 ./shapes.f90],
+                 newSourceFiles
+    
+    newModules = newSourceFiles.collect do |file|
+      @dep.modules_used_in( file )
+    end.flatten.uniq
+
+    assert_equal ["area"], newModules
+  end
+
+  def test_makefile_dependency_line_generation
+    sourceFile = "main.F90"
+    makeGolden=String.new <<-GOLDEN
 main.o: main.F90 \\
  grid.o \\
  solution.o \\
  shapes.o
-  GOLDEN
-  assert_equal makeGolden, @dep.makefile_dependency_line(sourceFile)
- end
+    GOLDEN
+    assert_equal makeGolden, @dep.makefile_dependency_line(sourceFile)
+  end
 
- def test_makefile_dependency_recurses_properly
-  makeGolden=String.new <<-GOLDEN
+  def test_makefile_dependency_recurses_properly
+    makeGolden=String.new <<-GOLDEN
 main.o: main.F90 \\
  grid.o \\
  solution.o \\
@@ -110,61 +120,58 @@ solution.o: solution.f90 \\
  area.o
 shapes.o: shapes.f90 \\
  area.o
-  GOLDEN
+    GOLDEN
+
+    goldSplit = makeGolden.split("\n")
+    testSplit = @dep.dependencies('main.F90').split("\n")
+
+    while (gold = goldSplit.shift) && (test = testSplit.shift)
+      assert_equal gold, test
+    end
+  end
+
+  def test_source_file_dependency_hash
+    @dep.source_file_dependencies('main.F90')
+    assert_equal( 5, @dep.file_dependencies.size )
+    expected = {
+      "./area.f90" => [],
+      "./grid.f90" => ["./area.f90"],
+      "../lib/solution.f90" => ["./area.f90"],
+      "./shapes.f90" => ["./area.f90"],
+      "main.F90" => ["./grid.f90", "../lib/solution.f90", "./shapes.f90"]
+    }
+    assert_equal expected, @dep.file_dependencies
+  end
 
-  goldSplit = makeGolden.split("\n")
-  testSplit = @dep.dependencies('main.F90').split("\n")
+  def test_finds_required_source_files
+    expected = %w[ ./area.f90 ./shapes.f90 ../lib/solution.f90
+                   ./grid.f90 ./main.F90 ]
+    found = @dep.required_source_files('./main.F90')
+    assert_equal expected.size, found.size
+    assert_equal './main.F90', found.last
+    assert_equal './area.f90', found.first
+  end
+
+  def test_finds_required_source_files_unordered
+    @dep.dependencies('main.F90')
+    sources = @dep.source_files
+    expected = %w[ main.F90 grid.f90 area.f90 solution.f90 shapes.f90 ]
+    assert_equal expected.size, sources.size
+    assert_equal 'shapes.f90', sources.last
+    assert_equal 'main.F90', sources.first
+    assert_equal expected, sources
+  end
+
+  def test_can_find_required_source_files_twice
+    files = %w[ ./main.F90 ./shapes.f90 ./area.f90
+                ../lib/solution.f90 ./grid.f90 ]
+    @dep.required_source_files('./main.F90')
+    assert_equal files.sort, @dep.required_source_files('./main.F90').sort
+  end
 
-  while (gold = goldSplit.shift) && (test = testSplit.shift)
-   assert_equal gold, test
+  def test_recognizes_external_modules
+    file = './externalUse.f90'
+    assert_equal [file], @dep.required_source_files(file).sort
   end
- end
-
- def test_source_file_dependency_hash
-  @dep.source_file_dependencies('main.F90')
-  assert_equal( 5, @dep.file_dependencies.size )
-  expected = {
-     "./area.f90" => [],
-     "./grid.f90" => ["./area.f90"],
-     "../lib/solution.f90" => ["./area.f90"],
-     "./shapes.f90" => ["./area.f90"],
-     "main.F90" => ["./grid.f90", "../lib/solution.f90", "./shapes.f90"]
-   }
-  assert_equal expected, @dep.file_dependencies
- end
-
- def test_finds_required_source_files
-  expected = %w[./area.f90 ./shapes.f90 ../lib/solution.f90 ./grid.f90 ./main.F90]
-  found = @dep.required_source_files('./main.F90')
-  assert_equal expected.size, found.size
-  assert_equal './main.F90', found.last
-  assert_equal './area.f90', found.first
- end
-
- def test_finds_required_source_files_unordered
-  @dep.dependencies('main.F90')
-  sources = @dep.source_files
-  expected = %w[ main.F90 grid.f90 area.f90 solution.f90 shapes.f90 ]
-  assert_equal expected.size, sources.size
-  assert_equal 'shapes.f90', sources.last
-  assert_equal 'main.F90', sources.first
-  assert_equal expected, sources
- end
-
- def test_can_find_required_source_files_twice
-  files = %w[./main.F90 ./shapes.f90 ./area.f90 ../lib/solution.f90 ./grid.f90]
-  @dep.required_source_files('./main.F90')
-  assert_equal files.sort, @dep.required_source_files('./main.F90').sort
- end
-
- def test_recognizes_external_modules
-  file = './externalUse.f90'
-  assert_equal [file], @dep.required_source_files(file).sort
- end
-
- def teardown
-  Dir.chdir '../..'
-  FileUtils.rm_rf 'DependenciesFixture'
- end
 
 end

data/tests/tc_funit.rb

@@ -8,111 +8,110 @@ require 'ftools'
 
 class TestFunit < Test::Unit::TestCase
 
- include Funit
- include Funit::Assertions
+  include Funit
+  include Funit::Assertions
 
- 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 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
+    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 test_main_driver_compiles
+    writeTestRunner []
+    assert File.exists?("TestRunner.f90")
+    assert system("#{Compiler.new.name} TestRunner.f90")
+    assert File.exists?("a.out")
+  end
 
- def Xtest_is_equal
-  @suiteName = "dummy"
-  @testName = "dummy"
-  @lineNumber = "dummy"
-  isequal("IsEqual(1.0,m(1,1))")
-  assert_equal '.not.(1.0==m(1,1))', @condition
- end 
+  def test_is_equal
+    @suiteName = "dummy"
+    @testName = "dummy"
+    @lineNumber = "dummy"
+    isequal("IsEqual(1.0,m(1,1))")
+    assert_equal '.not.(1.0==m(1,1))', @condition
+  end 
 
- def Xtest_is_real_equal
-  @suiteName = "dummy"
-  @testName = "dummy"
-  @lineNumber = "dummy"
-  isrealequal("IsRealEqual(a,b)")
-ans = <<EOF
+  def test_is_real_equal
+    @suiteName = "dummy"
+    @testName = "dummy"
+    @lineNumber = "dummy"
+    isrealequal("IsRealEqual(a,b)")
+    ans = <<-EOF
 .not.(a+2*spacing(real(a)).ge.b &
              .and.a-2*spacing(real(a)).le.b)
-EOF
-  assert_equal ans.chomp, @condition
-  assert_equal '"b (",b,") is not",a,"within",2*spacing(real(a))', @message 
-
-  isrealequal("IsRealEqual(1.0,m(1,1))")
-ans = <<EOF
+    EOF
+    assert_equal ans.chomp, @condition
+    assert_equal '"b (",b,") is not",a,"within",2*spacing(real(a))', @message
+    isrealequal("IsRealEqual(1.0,m(1,1))")
+    ans = <<-EOF
 .not.(1.0+2*spacing(real(1.0)).ge.m(1,1) &
              .and.1.0-2*spacing(real(1.0)).le.m(1,1))
-EOF
-  assert_equal ans.chomp, @condition
- end
-
- def test_handles_dependency
-  File.open('unit.f90','w') do |f|
-   f.printf "module unit\n  use unita, only : a\nend module unit\n"
-  end
-  File.open('unita.f90','w') do |f|
-   f.printf "module unita\n  integer :: a = 5\nend module unita\n"
+    EOF
+    assert_equal ans.chomp, @condition
   end
-  File.open('unit.fun','w') do |f|
-   f.printf "beginTest a_gets_set\n  IsEqual(5, a)\nendTest\n"
-  end  
-  assert_nothing_raised{run_tests}
- end
 
- def test_embedded_dependencies
-  File.open('unit.f90','w') do |f|
-   f.printf "module unit\n  use unita, only : a\nend module unit\n"
-  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"
-  end
-  File.open('unitb.f90','w') do |f|
-   f.printf "module unitb\n  integer,parameter :: b = 5\nend module unitb\n"
+  def test_handles_dependency
+    File.open('unit.f90','w') do |f|
+      f.printf "module unit\n  use unita, only : a\nend module unit\n"
+    end
+    File.open('unita.f90','w') do |f|
+      f.printf "module unita\n  integer :: a = 5\nend module unita\n"
+    end
+    File.open('unit.fun','w') do |f|
+      f.printf "beginTest a_gets_set\n  IsEqual(5, a)\nendTest\n"
+    end
+    assert_nothing_raised{run_tests}
   end
-  File.open('unit.fun','w') do |f|
-   f.printf "beginTest a_gets_set\n  IsEqual(5, a)\nendTest\n"
-  end  
-  assert_nothing_raised{run_tests}
- end
-
- def test_requested_modules
-  assert_equal ["asdfga"], requestedModules(["asdfga"])
-  assert_equal ["asd","fga"], requestedModules(["asd","fga"])
-   assert requestedModules([]).empty?
-  modules = %w[ldfdl lmzd]
-  funits = modules.map{|f| f+'.fun'}.join(' ')
-  system "touch "+funits
-  assert_equal modules, requestedModules([])
- end
 
- def test_funit_exists_method
-  moduleName = "ydsbe"
-  File.rm_f(moduleName+".fun")
-  assert_equal false, funit_exists?(moduleName)
-  system "touch "+moduleName+".fun"
-  assert funit_exists?(moduleName)
+  def test_embedded_dependencies
+    File.open('unit.f90','w') do |f|
+      f.printf "module unit\n  use unita, only : a\nend module unit\n"
+    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"
+    end
+    File.open('unitb.f90','w') do |f|
+      f.printf "module unitb\n  integer,parameter :: b = 5\nend module unitb\n"
+    end
+    File.open('unit.fun','w') do |f|
+      f.printf "beginTest a_gets_set\n  IsEqual(5, a)\nendTest\n"
+    end
+    assert_nothing_raised{run_tests}
  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 test_requested_modules
+    assert_equal ["asdfga"], requestedModules(["asdfga"])
+    assert_equal ["asd","fga"], requestedModules(["asd","fga"])
+    assert requestedModules([]).empty?
+    modules = %w[ldfdl lmzd]
+    funits = modules.map{|f| f+'.fun'}.join(' ')
+    system "touch "+funits
+    assert_equal modules, requestedModules([])
+  end
 
- def teardown
-  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 test_funit_exists_method
+    moduleName = "ydsbe"
+    File.rm_f(moduleName+".fun")
+    assert_equal false, funit_exists?(moduleName)
+    system "touch "+moduleName+".fun"
+    assert funit_exists?(moduleName)
+  end
 
 end