funit 0.10.3 → 0.11.0

data/History.txt

@@ -1,15 +1,26 @@
+=== 0.11.0 / 2009-11-01
+
+* 1 minor enhancement
+  * Allow testing of routines not contained in modules
+
+=== 0.10.4 / 2009-10-15
+
+* 2 minor enhancements
+  * Pass LDFLAGS environment variable to linker (Steve Turley)
+  * Formatted test summary line with i0 instead of *
+
 === 0.10.3 / 2009-10-05
 
 * 1 minor enhancement
-  * Allow --source to accept multiple directories
+  * Allow <tt>--source</tt> to accept multiple directories
 * 1 bug fix
-  * Make funit's setup and teardown subroutine names unique to avoid
+  * Make Funit's setup and teardown subroutine names unique to avoid
     collision with same routine names in module under test.
 
 === 0.10.2 / 2008-03-30
 
 * 2 bug fixes
-  * Updated README with proper syntax
+  * Updated <tt>README.txt</tt> with proper syntax
   * Corrected prior release history copy and version number
 
 === 0.10.1 / 2008-03-30
@@ -18,40 +29,41 @@
   * Non-passing tests exit with non-zero exit code
 
 * 1 minor enhancement
-  * --version / -V options
+  * Added <tt>--version</tt> / <tt>-V</tt> options
 
 === 0.10.0 / 2008-03-30 (all courtesy of Diego Virasoro)
 
 * 4 major enhancements
-  * User can now use 'funit --clean' to remove the generated files
+  * User can now use <tt>funit --clean</tt> to remove the generated files
   * Source directory and test directory can be different: specify
-    source dir with -s (or --source) flag
+    source dir with <tt>-s</tt>(or <tt>--source</tt> 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
+  * The <tt>.fun</tt> file name is not constrained anymore, but now each test suite
+    must be surrounded by <tt>test_suite name</tt> and <tt>end test_suite</tt>,
+    where <tt>name</tt> is the name of the module to be tested
   * Multiple test suites can exist inside the same file
 
 * 5 minor enhancements
-  * Change blocks nomenclature: beginTest -> test and endTest -> end test
+  * Change blocks nomenclature: <tt>beginTest</tt> -> <tt>test</tt> and
+    <tt>endTest</tt> -> <tt>end test</tt>
     (and similarly for setup and teardown)
-  * Change assertions nomenclature (eg. IsEqual -> assert_equal)
-  * Added one new assertion: assert_array_equal
+  * Change assertions nomenclature (eg. <tt>IsEqual</tt> -> <tt>assert_equal</tt>)
+  * Added one new assertion: <tt>assert_array_equal</tt>
   * 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
+  * Broke up more long conditionals with continuation
     characters to avoid truncated lines
-  * added shebang to main for rubygems 1.0
+  * Added shebang to main for rubygems 1.0
 
 === 0.9.3 / 2007-12-23
 
 * 2 bug fixes
-  * README.txt project URLs
+  * Project URLs in <tt>README.txt</tt>
   * Repaired a test broken by 0.9.2
 
 === 0.9.2 / 2007-09-21
@@ -63,19 +75,18 @@
 === 0.9.1 / 2007-08-20
 
 * 1 minor enhancement
-  * Stripped './' path prefixes and '\' continuations to
+  * Stripped <tt>./</tt> path prefixes and <tt>\</tt> continuations to
     appease windoze
 
 === 0.9.0 / 2007-07-26
 
 * 1 minor enhancement
-  * Extracted fortran dependency engine -- see fortran gem.
+  * Extracted fortran dependency engine -- see <tt>fortran</tt> gem.
 
 === 0.1.3 / 2006-06-21
 
 * 1 bug fix
-  * Do not remove unit tests! (Thanks to Sebastian Hanigk
-    and James Quirk.)
+  * Do not remove unit tests! (Thanks to Sebastian Hanigk and James Quirk.)
 
 === 0.1.2 / 2006-05-16
 

data/Rakefile

@@ -10,7 +10,7 @@ require 'funit.rb'
 Hoe.new('funit', Funit::VERSION) do |funit|
   funit.rubyforge_name  = 'nasarb'
   funit.remote_rdoc_dir = 'funit' 
-  funit.extra_deps << [ 'fortran', '>= 1.0.1' ]
+  funit.extra_deps << [ 'fortran', '>= 1.1.0' ]
   funit.spec_extras[:requirements] = "A Fortran compiler."
   funit.author =
     [ 'Karen Bibb', 'Bil Kleb', 'Beth Lee-Rausch', 'Mike Park', 'Bill Wood' ]

data/lib/funit.rb

@@ -14,7 +14,7 @@ require 'fileutils'
 
 module Funit
 
-  VERSION = '0.10.3'
+  VERSION = '0.11.0'
 
   ##
   # run all tests
@@ -27,8 +27,13 @@ module Funit
       tf_content = IO.read(test_file+'.fun')
       tf_content.scan(/test_suite\s+(\w+)(.*?)end\s+test_suite/m).each{|ts|
         ts_name = $1
+        ts_content = $2
         if((!File.exist?(ts_name+"_fun.f90")) || File.mtime(ts_name+"_fun.f90") < File.mtime(test_file+".fun")) then
-          TestSuite.new(ts_name, $2)
+          if ( File.read(ts_name+'.f90').match(/\s*module\s+#{ts_name}/i) ) then
+            TestSuite.new(ts_name, ts_content, false)
+          else
+            TestSuite.new(ts_name, ts_content, true)
+          end
         end
         test_suites.push(ts_name)
       }

data/lib/funit/functions.rb

@@ -22,9 +22,9 @@ module Funit
       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."
+      write(*,1) numAssertsTested(<%= i+1 %>), numAsserts(<%= i+1 %>), &
+        numTests(<%= i+1 %>)-numFailures(<%= i+1 %>), numTests(<%= i+1 %>)
+    1 format('Passed ',i0,' of ',i0,' possible asserts comprising ',i0,' of ',i0,' tests.')
       <% end -%>
 
       write(*,*)
@@ -55,7 +55,7 @@ module Funit
     all:testrunner
 
     testrunner: $(OBJ)
-    <%= "\t#{ENV['FC']} #{ENV['FCFLAGS']}" %> -o TestRunner $(OBJ)
+    <%= "\t#{ENV['FC']} #{ENV['FCFLAGS']} #{ENV['LDFLAGS']}" %> -o TestRunner $(OBJ)
 
     <% file_dependencies.each do |source,dep| -%>
     <%= "#{source.sub(/\.f90/i,'.o')}: #{source} #{dep.map{ |d| d.sub(/\.f90/i,'.o') }.join(' ')}" %>

data/lib/funit/testsuite.rb

@@ -15,7 +15,7 @@ module Funit
     
     include Funit #FIXME
 
-    def initialize suite_name, suite_content=''
+    def initialize( suite_name, suite_content, wrap_with_module )
       @line_number = 'blank'
       @suite_name = suite_name
       @suite_content = suite_content
@@ -23,21 +23,38 @@ module Funit
       File.delete(suite_name+"_fun.f90") if File.exists?(suite_name+"_fun.f90")
       super(suite_name+"_fun.f90","w")
       @tests, @setup, @teardown = [], [], []
+      header
+      @wrap_with_module = wrap_with_module
+      module_wrapper if @wrap_with_module
       top_wrapper
       expand
       close
     end
 
-    def top_wrapper
-      puts <<-TOP
+    def header
+      puts <<-HEADER
 ! #{@suite_name}_fun.f90 - a unit test suite for #{@suite_name}.f90
 !
 ! #{File.basename $0} generated this file from #{@suite_name}.fun
-! at #{Time.now}
 
+      HEADER
+    end
+
+    def module_wrapper
+      puts <<-MODULE_WRAPPER
+module #{@suite_name}_mod
+contains
+  include '#@suite_name.f90'
+end module #{@suite_name}_mod
+
+      MODULE_WRAPPER
+    end
+
+    def top_wrapper
+      puts <<-TOP
 module #{@suite_name}_fun
 
- use #{@suite_name}
+ use #{ @wrap_with_module ? @suite_name+'_mod' : @suite_name }
 
  implicit none
 

data/test/test_testsuite.rb

@@ -17,7 +17,7 @@ class TestTestSuite < Test::Unit::TestCase
   end 
 
   def test_nonexistent_funit_file_is_not_created
-    Funit::TestSuite.new 'dummyf90test'
+    Funit::TestSuite.new 'dummyf90test', '', false
     assert !File.exists?("dummyf90test.fun")
     assert !File.exists?("dummyf90test_fun.f90")
   end
@@ -35,31 +35,31 @@ class TestTestSuite < Test::Unit::TestCase
 
   def test_bare_minimum_funit_file_compiles
     create_funit_file ""
-    Funit::TestSuite.new 'dummyf90test'
+    Funit::TestSuite.new 'dummyf90test', '', false
     assert system(@@compileCommand)
   end
 
   def test_module_variables_allowed
     create_funit_file "integer :: a"
-    Funit::TestSuite.new 'dummyf90test'
+    Funit::TestSuite.new 'dummyf90test', '', false
     assert system(@@compileCommand)
   end
 
   def test_blank_setup_compiles
     create_funit_file "beginSetup\nendSetup"
-    Funit::TestSuite.new 'dummyf90test'
+    Funit::TestSuite.new 'dummyf90test', '', false
     assert system(@@compileCommand)
   end
 
   def test_blank_test_gives_warning
     create_funit_file "beginTest bob\nendTest"
-    Funit::TestSuite.new 'dummyf90test'
+    Funit::TestSuite.new 'dummyf90test', '', false
     assert system(@@compileCommand)
   end
 
   def test_single_assert_test_compiles
     create_funit_file "beginTest assertTrue\nAssertTrue(.true.)\nendTest"
-    Funit::TestSuite.new 'dummyf90test'
+    Funit::TestSuite.new 'dummyf90test', '', false
     assert system(@@compileCommand)
   end
 
@@ -71,7 +71,7 @@ class TestTestSuite < Test::Unit::TestCase
   AssertEqual(1,a(1,1))
  endTest
     MATRIX
-    Funit::TestSuite.new 'dummyf90test'
+    Funit::TestSuite.new 'dummyf90test', '', false
     assert system(@@compileCommand)
   end
 
@@ -83,7 +83,7 @@ class TestTestSuite < Test::Unit::TestCase
   AssertRealEqual(1.0,real_var)
  endTest
     REALEQUALS
-    Funit::TestSuite.new 'dummyf90test'
+    Funit::TestSuite.new 'dummyf90test', '', false
     assert system(@@compileCommand)
   end
 
@@ -98,13 +98,13 @@ class TestTestSuite < Test::Unit::TestCase
   balance = 0.5*(left+right)
  end function balance
     REQUALSFUNC
-    Funit::TestSuite.new 'dummyf90test'
+    Funit::TestSuite.new 'dummyf90test', '', false
     assert system(@@compileCommand)
   end
 
   def test_ignore_commented_test
     create_funit_file "XbeginTest bob\nendTest"
-    Funit::TestSuite.new 'dummyf90test'
+    Funit::TestSuite.new 'dummyf90test', '', false
     assert_no_match( /Testbob/i, IO.readlines('dummyf90test_fun.f90').join )
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: funit
 version: !ruby/object:Gem::Version 
-  version: 0.10.3
+  version: 0.11.0
 platform: ruby
 authors: 
 - Karen Bibb
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-05 00:00:00 -04:00
+date: 2009-11-01 01:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.1
+        version: 1.1.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -34,23 +34,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.12.2
+        version: 2.3.3
     version: 
-description: |-
-  FUnit is a unit testing framework for Fortran.
-  
-  Unit tests are written as Fortran fragments that use a small
-  set of testing-specific keywords and functions.  FUnit transforms
-  these fragments into valid Fortran code, compiles, links, and
-  runs them against the code under test.
-  
-  FUnit is {opinionated software}[http://www.oreillynet.com/pub/a/network/2005/08/30/ruby-rails-david-heinemeier-hansson.html], which values convention over
-  configuration. Specifically, FUnit,
-  
-  * requires a Fortran 95 compiler,
-  * only supports testing routines contained in modules,
-  * requires tests to be stored along side the code under test, and
-  * requires test files to be named appropriately.
+description: FUnit is a unit testing framework for Fortran.  Unit tests are written as Fortran fragments that use a small set of testing-specific keywords and functions.  FUnit transforms these fragments into valid Fortran code, compiles, links, and runs them against the code under test.  FUnit is {opinionated software}[http://www.oreillynet.com/pub/a/network/2005/08/30/ruby-rails-david-heinemeier-hansson.html], which values convention over configuration. Specifically, FUnit,  * requires a Fortran 95 compiler, * only supports testing routines contained in modules, * requires tests to be stored along side the code under test, and * requires test files to be named appropriately.
 email: nasarb-developers@rubyforge.org
 executables: 
 - funit
@@ -92,8 +78,6 @@ files:
 - utils/funit-mode.el
 has_rdoc: true
 homepage: http://rubyforge.org/projects/nasarb
-licenses: []
-
 post_install_message: 
 rdoc_options: 
 - --main
@@ -115,9 +99,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - A Fortran compiler.
 rubyforge_project: nasarb
-rubygems_version: 1.3.3
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: FUnit is a unit testing framework for Fortran
 test_files: 
 - test/test_compiler.rb