fUnit 0.1.0 → 0.1.1

data/README

@@ -92,7 +92,7 @@ or submit a request through
 FUnit is released under the NASA Open Source Agreement, which
 requests registration.  If you would like to register, send
 an email to
-{funit-registration@rubyforge.org}[mailto:funit-registration@rubyforge.org?subject=fUnit%20Registration]
+{funit-registration@rubyforge.org}[mailto:funit-registration@rubyforge.org?subject=fUnit%20Registration&body=%20%20%20%20%20%20%20Name:%20%0AInstitution:%20%0A%20%20%20%20%20%20%20City:%20%0APostal%20Code:%20%0A%20%20%20%20Country:%20]
 with your name, institution (if applicable), city, postal code, and country.
 See COPYING[http://funit.rubyforge.org/files/COPYING.html] for details.
 
@@ -120,14 +120,11 @@ rewrote the framework in Ruby[http:www.ruby-lang.org].
 
 * Make tests fail gracefully if Fortran compiler is not found.
 * Complete migration from CamelCase to snake_case for methods and variables.
-* Use 2-space indentation everywhere.
 * Use 'test' keyword instead of 'beginTest' business.
 * Don't add to test name during translation to avoid
   Fortran's 32-character limit on names.
 * Rename assertions to more consistent with other xUnits.
 * Add assertions to capture stops and warning messages.
-* Clean up documentation.
 * To increase portability, create a single, stand-alone executable with
   Erik Veenstra's RubyScript2Exe[http://www.erikveen.dds.nl/rubyscript2exe/].
 * Use a makefile instead of a single, ordered command line for compilation.
-* Add a clean option to remove all generated artifacts.

data/Rakefile

@@ -18,8 +18,9 @@ end
 
 require 'rake/testtask'
 require 'rake/rdoctask'
+require 'rake/clean'
 
-PKG_VERSION = '0.1.0'
+PKG_VERSION = '0.1.1'
 
 PKG_FILES = FileList[
   '[A-Z]*',
@@ -27,9 +28,13 @@ PKG_FILES = FileList[
   'docs/**/*',
   'examples/**/*',
   'lib/**/*',
-  'tests/**/*.rb'
+  'tests/**/*.rb',
+  'utils/**/*'
 ]
 
+CLEAN.include( "**/*_fun.f90", "examples/**/TestRunner*",
+               "**/*.o", "**/*.mod", "**/*.MOD")
+
 desc 'Default task'
 task :default => [:test]
 

data/bin/funit

@@ -1,3 +1,5 @@
+# Main fUnit routine -*- ruby -*-
+#--
 # Copyright 2006 United States Government as represented by
 # NASA Langley Research Center. No copyright is claimed in
 # the United States under Title 17, U.S. Code. All Other Rights
@@ -5,6 +7,7 @@
 #
 # This file is governed by the NASA Open Source Agreement.
 # See COPYING for details.
+#++
 
 begin
   require 'funit'

data/docs/html/classes/Funit.html

@@ -102,14 +102,14 @@ Compile and run the requested tests
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000008">compileTests</a>&nbsp;&nbsp;
-      <a href="#M000003">funit_exists?</a>&nbsp;&nbsp;
-      <a href="#M000004">parseCommandLine</a>&nbsp;&nbsp;
-      <a href="#M000002">requestedModules</a>&nbsp;&nbsp;
-      <a href="#M000001">run_tests</a>&nbsp;&nbsp;
-      <a href="#M000006">syntaxError</a>&nbsp;&nbsp;
-      <a href="#M000007">warning</a>&nbsp;&nbsp;
-      <a href="#M000005">writeTestRunner</a>&nbsp;&nbsp;
+      <a href="#M000009">compileTests</a>&nbsp;&nbsp;
+      <a href="#M000004">funit_exists?</a>&nbsp;&nbsp;
+      <a href="#M000005">parseCommandLine</a>&nbsp;&nbsp;
+      <a href="#M000003">requestedModules</a>&nbsp;&nbsp;
+      <a href="#M000002">run_tests</a>&nbsp;&nbsp;
+      <a href="#M000007">syntaxError</a>&nbsp;&nbsp;
+      <a href="#M000008">warning</a>&nbsp;&nbsp;
+      <a href="#M000006">writeTestRunner</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -147,19 +147,19 @@ Class <a href="Funit/TestSuite.html" class="link">Funit::TestSuite</a><br />
     <div id="methods">
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000008" class="method-detail">
-        <a name="M000008"></a>
+      <div id="method-M000009" class="method-detail">
+        <a name="M000009"></a>
 
         <div class="method-heading">
-          <a href="#M000008" class="method-signature">
+          <a href="#M000009" class="method-signature">
           <span class="method-name">compileTests</span><span class="method-args">(testSuites)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000008-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000008-source">
+            onclick="toggleCode('M000009-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000009-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/funit/functions.rb, line 121</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">compileTests</span> <span class="ruby-identifier">testSuites</span>
@@ -177,19 +177,19 @@ Class <a href="Funit/TestSuite.html" class="link">Funit::TestSuite</a><br />
         </div>
       </div>
 
-      <div id="method-M000003" class="method-detail">
-        <a name="M000003"></a>
+      <div id="method-M000004" class="method-detail">
+        <a name="M000004"></a>
 
         <div class="method-heading">
-          <a href="#M000003" class="method-signature">
+          <a href="#M000004" class="method-signature">
           <span class="method-name">funit_exists?</span><span class="method-args">(moduleName)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000003-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000003-source">
+            onclick="toggleCode('M000004-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000004-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/funit/functions.rb, line 40</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">funit_exists?</span>(<span class="ruby-identifier">moduleName</span>)
@@ -200,19 +200,19 @@ Class <a href="Funit/TestSuite.html" class="link">Funit::TestSuite</a><br />
         </div>
       </div>
 
-      <div id="method-M000004" class="method-detail">
-        <a name="M000004"></a>
+      <div id="method-M000005" class="method-detail">
+        <a name="M000005"></a>
 
         <div class="method-heading">
-          <a href="#M000004" class="method-signature">
+          <a href="#M000005" class="method-signature">
           <span class="method-name">parseCommandLine</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000004-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000004-source">
+            onclick="toggleCode('M000005-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000005-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/funit/functions.rb, line 44</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">parseCommandLine</span>
@@ -236,19 +236,19 @@ Class <a href="Funit/TestSuite.html" class="link">Funit::TestSuite</a><br />
         </div>
       </div>
 
-      <div id="method-M000002" class="method-detail">
-        <a name="M000002"></a>
+      <div id="method-M000003" class="method-detail">
+        <a name="M000003"></a>
 
         <div class="method-heading">
-          <a href="#M000002" class="method-signature">
+          <a href="#M000003" class="method-signature">
           <span class="method-name">requestedModules</span><span class="method-args">(moduleNames)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000002-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000002-source">
+            onclick="toggleCode('M000003-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000003-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/funit/functions.rb, line 33</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">requestedModules</span>(<span class="ruby-identifier">moduleNames</span>)
@@ -262,19 +262,19 @@ Class <a href="Funit/TestSuite.html" class="link">Funit::TestSuite</a><br />
         </div>
       </div>
 
-      <div id="method-M000001" class="method-detail">
-        <a name="M000001"></a>
+      <div id="method-M000002" class="method-detail">
+        <a name="M000002"></a>
 
         <div class="method-heading">
-          <a href="#M000001" class="method-signature">
+          <a href="#M000002" class="method-signature">
           <span class="method-name">run_tests</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000001-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000001-source">
+            onclick="toggleCode('M000002-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000002-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/funit.rb, line 18</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">run_tests</span>
@@ -293,19 +293,19 @@ Class <a href="Funit/TestSuite.html" class="link">Funit::TestSuite</a><br />
         </div>
       </div>
 
-      <div id="method-M000006" class="method-detail">
-        <a name="M000006"></a>
+      <div id="method-M000007" class="method-detail">
+        <a name="M000007"></a>
 
         <div class="method-heading">
-          <a href="#M000006" class="method-signature">
+          <a href="#M000007" class="method-signature">
           <span class="method-name">syntaxError</span><span class="method-args">( message, testSuite )</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000006-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000006-source">
+            onclick="toggleCode('M000007-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000007-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/funit/functions.rb, line 113</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">syntaxError</span>( <span class="ruby-identifier">message</span>, <span class="ruby-identifier">testSuite</span> )
@@ -316,19 +316,19 @@ Class <a href="Funit/TestSuite.html" class="link">Funit::TestSuite</a><br />
         </div>
       </div>
 
-      <div id="method-M000007" class="method-detail">
-        <a name="M000007"></a>
+      <div id="method-M000008" class="method-detail">
+        <a name="M000008"></a>
 
         <div class="method-heading">
-          <a href="#M000007" class="method-signature">
+          <a href="#M000008" class="method-signature">
           <span class="method-name">warning</span><span class="method-args">( message, testSuite )</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000007-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000007-source">
+            onclick="toggleCode('M000008-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000008-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/funit/functions.rb, line 117</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">warning</span>( <span class="ruby-identifier">message</span>, <span class="ruby-identifier">testSuite</span> )
@@ -339,19 +339,19 @@ Class <a href="Funit/TestSuite.html" class="link">Funit::TestSuite</a><br />
         </div>
       </div>
 
-      <div id="method-M000005" class="method-detail">
-        <a name="M000005"></a>
+      <div id="method-M000006" class="method-detail">
+        <a name="M000006"></a>
 
         <div class="method-heading">
-          <a href="#M000005" class="method-signature">
+          <a href="#M000006" class="method-signature">
           <span class="method-name">writeTestRunner</span><span class="method-args">(testSuites)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000005-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000005-source">
+            onclick="toggleCode('M000006-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000006-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/funit/functions.rb, line 68</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">writeTestRunner</span> <span class="ruby-identifier">testSuites</span>

data/docs/html/classes/Funit/Assertions.html

@@ -80,12 +80,12 @@
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000013">isequal</a>&nbsp;&nbsp;
-      <a href="#M000012">isequalwithin</a>&nbsp;&nbsp;
-      <a href="#M000010">isfalse</a>&nbsp;&nbsp;
-      <a href="#M000011">isrealequal</a>&nbsp;&nbsp;
-      <a href="#M000009">istrue</a>&nbsp;&nbsp;
-      <a href="#M000014">writeAssert</a>&nbsp;&nbsp;
+      <a href="#M000014">isequal</a>&nbsp;&nbsp;
+      <a href="#M000013">isequalwithin</a>&nbsp;&nbsp;
+      <a href="#M000011">isfalse</a>&nbsp;&nbsp;
+      <a href="#M000012">isrealequal</a>&nbsp;&nbsp;
+      <a href="#M000010">istrue</a>&nbsp;&nbsp;
+      <a href="#M000015">writeAssert</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -107,23 +107,23 @@
     <div id="methods">
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000013" class="method-detail">
-        <a name="M000013"></a>
+      <div id="method-M000014" class="method-detail">
+        <a name="M000014"></a>
 
         <div class="method-heading">
-          <a href="#M000013" class="method-signature">
+          <a href="#M000014" class="method-signature">
           <span class="method-name">isequal</span><span class="method-args">(line)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000013-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000013-source">
+            onclick="toggleCode('M000014-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000014-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/funit/assertions.rb, line 52</span>
+<span class="ruby-comment cmt"># File lib/funit/assertions.rb, line 82</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">isequal</span>(<span class="ruby-identifier">line</span>)
-      <span class="ruby-identifier">line</span><span class="ruby-operator">=~</span><span class="ruby-regexp re">/\((\w+\(.*\)|[^,]+),(.+)\)/</span>
+      <span class="ruby-identifier">line</span>.<span class="ruby-identifier">match</span>(<span class="ruby-regexp re">/\((\w+\(.*\)|[^,]+),(.+)\)/</span>)
       <span class="ruby-ivar">@type</span> = <span class="ruby-value str">'IsEqual'</span>
       <span class="ruby-ivar">@condition</span> = <span class="ruby-value str">&quot;.not.(#$1==#$2)&quot;</span>
       <span class="ruby-ivar">@message</span> = <span class="ruby-value str">&quot;\&quot;#$1 (\&quot;,#$1,\&quot;) is not\&quot;, #$2&quot;</span>
@@ -135,26 +135,27 @@
         </div>
       </div>
 
-      <div id="method-M000012" class="method-detail">
-        <a name="M000012"></a>
+      <div id="method-M000013" class="method-detail">
+        <a name="M000013"></a>
 
         <div class="method-heading">
-          <a href="#M000012" class="method-signature">
+          <a href="#M000013" class="method-signature">
           <span class="method-name">isequalwithin</span><span class="method-args">(line)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000012-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000012-source">
+            onclick="toggleCode('M000013-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000013-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/funit/assertions.rb, line 43</span>
+<span class="ruby-comment cmt"># File lib/funit/assertions.rb, line 72</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">isequalwithin</span>(<span class="ruby-identifier">line</span>)
-      <span class="ruby-identifier">line</span><span class="ruby-operator">=~</span><span class="ruby-regexp re">/\(([^,]+),(.+),(.+)\)/</span>
+      <span class="ruby-identifier">line</span>.<span class="ruby-identifier">match</span>(<span class="ruby-regexp re">/\((.*)\)/</span>)
+      <span class="ruby-identifier">expected</span>, <span class="ruby-identifier">actual</span>, <span class="ruby-identifier">tolerance</span> = <span class="ruby-operator">*</span>(<span class="ruby-identifier">$1</span>.<span class="ruby-identifier">get_args</span>)
       <span class="ruby-ivar">@type</span> = <span class="ruby-value str">'IsEqualWithin'</span>
-      <span class="ruby-ivar">@condition</span> = <span class="ruby-value str">&quot;.not.(#$2+#$3.ge.#$1 &amp;\n             .and.#$2-#$3.le.#$1)&quot;</span>
-      <span class="ruby-ivar">@message</span> = <span class="ruby-value str">&quot;\&quot;#$1 (\&quot;,#$1,\&quot;) is not\&quot;,#$2,\&quot;within\&quot;,#$3&quot;</span>
+      <span class="ruby-ivar">@condition</span> = <span class="ruby-node">&quot;.not.(#{actual}+#{tolerance}.ge.#{expected} &amp;\n             .and.#{actual}-#{tolerance}.le.#{expected})&quot;</span>
+      <span class="ruby-ivar">@message</span> = <span class="ruby-node">&quot;\&quot;#{expected} (\&quot;,#{expected},\&quot;) is not\&quot;,#{actual},\&quot;within\&quot;,#{tolerance}&quot;</span>
       <span class="ruby-identifier">syntaxError</span>(<span class="ruby-value str">&quot;invalid body for #@type&quot;</span>,<span class="ruby-ivar">@suiteName</span>) <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">$&amp;</span>
       <span class="ruby-identifier">writeAssert</span>
     <span class="ruby-keyword kw">end</span>
@@ -163,54 +164,55 @@
         </div>
       </div>
 
-      <div id="method-M000010" class="method-detail">
-        <a name="M000010"></a>
+      <div id="method-M000011" class="method-detail">
+        <a name="M000011"></a>
 
         <div class="method-heading">
-          <a href="#M000010" class="method-signature">
+          <a href="#M000011" class="method-signature">
           <span class="method-name">isfalse</span><span class="method-args">(line)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000010-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000010-source">
+            onclick="toggleCode('M000011-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000011-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/funit/assertions.rb, line 25</span>
+<span class="ruby-comment cmt"># File lib/funit/assertions.rb, line 53</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">isfalse</span>(<span class="ruby-identifier">line</span>)
-      <span class="ruby-identifier">line</span><span class="ruby-operator">=~</span><span class="ruby-regexp re">/\((.+)\)/</span>
+      <span class="ruby-identifier">line</span>.<span class="ruby-identifier">match</span>(<span class="ruby-regexp re">/\((.+)\)/</span>)
       <span class="ruby-ivar">@type</span> = <span class="ruby-value str">'IsFalse'</span>
       <span class="ruby-ivar">@condition</span> = <span class="ruby-value str">&quot;#$1&quot;</span>
       <span class="ruby-ivar">@message</span> = <span class="ruby-value str">&quot;\&quot;#$1 is not false\&quot;&quot;</span>
       <span class="ruby-identifier">syntaxError</span>(<span class="ruby-value str">&quot;invalid body for #@type&quot;</span>,<span class="ruby-ivar">@suiteName</span>) <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">$1</span><span class="ruby-operator">=~</span><span class="ruby-regexp re">/\S+/</span>
-        <span class="ruby-identifier">writeAssert</span>
+      <span class="ruby-identifier">writeAssert</span>
     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000011" class="method-detail">
-        <a name="M000011"></a>
+      <div id="method-M000012" class="method-detail">
+        <a name="M000012"></a>
 
         <div class="method-heading">
-          <a href="#M000011" class="method-signature">
+          <a href="#M000012" class="method-signature">
           <span class="method-name">isrealequal</span><span class="method-args">(line)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000011-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000011-source">
+            onclick="toggleCode('M000012-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000012-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/funit/assertions.rb, line 34</span>
+<span class="ruby-comment cmt"># File lib/funit/assertions.rb, line 62</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">isrealequal</span>(<span class="ruby-identifier">line</span>)
-      <span class="ruby-identifier">line</span><span class="ruby-operator">=~</span><span class="ruby-regexp re">/\(([^,]+),(.+)\)/</span>
+      <span class="ruby-identifier">line</span>.<span class="ruby-identifier">match</span>(<span class="ruby-regexp re">/\((.*)\)/</span>)
+      <span class="ruby-identifier">expected</span>, <span class="ruby-identifier">actual</span> = <span class="ruby-operator">*</span>(<span class="ruby-identifier">$1</span>.<span class="ruby-identifier">get_args</span>)
       <span class="ruby-ivar">@type</span> = <span class="ruby-value str">'IsRealEqual'</span>
-      <span class="ruby-ivar">@condition</span> = <span class="ruby-value str">&quot;.not.(#$1+2*spacing(real(#$1)).ge.#$2 &amp;\n             .and.#$1-2*spacing(real(#$1)).le.#$2)&quot;</span>
-      <span class="ruby-ivar">@message</span> = <span class="ruby-value str">&quot;\&quot;#$2 (\&quot;,#$2,\&quot;) is not\&quot;,#$1,\&quot;within\&quot;,2*spacing(real(#$1))&quot;</span>
+      <span class="ruby-ivar">@condition</span> = <span class="ruby-node">&quot;.not.(#{expected}+2*spacing(real(#{expected})).ge.#{actual} &amp;\n             .and.#{expected}-2*spacing(real(#{expected})).le.#{actual})&quot;</span>
+      <span class="ruby-ivar">@message</span> = <span class="ruby-node">&quot;\&quot;#{actual} (\&quot;,#{actual},\&quot;) is not\&quot;,#{expected},\&quot;within\&quot;,2*spacing(real(#{expected}))&quot;</span>
       <span class="ruby-identifier">syntaxError</span>(<span class="ruby-value str">&quot;invalid body for #@type&quot;</span>,<span class="ruby-ivar">@suiteName</span>) <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">$&amp;</span>
       <span class="ruby-identifier">writeAssert</span>
     <span class="ruby-keyword kw">end</span>
@@ -219,51 +221,51 @@
         </div>
       </div>
 
-      <div id="method-M000009" class="method-detail">
-        <a name="M000009"></a>
+      <div id="method-M000010" class="method-detail">
+        <a name="M000010"></a>
 
         <div class="method-heading">
-          <a href="#M000009" class="method-signature">
+          <a href="#M000010" class="method-signature">
           <span class="method-name">istrue</span><span class="method-args">(line)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000009-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000009-source">
+            onclick="toggleCode('M000010-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000010-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/funit/assertions.rb, line 16</span>
+<span class="ruby-comment cmt"># File lib/funit/assertions.rb, line 44</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">istrue</span>(<span class="ruby-identifier">line</span>)
-      <span class="ruby-identifier">line</span><span class="ruby-operator">=~</span><span class="ruby-regexp re">/\((.+)\)/</span>
+      <span class="ruby-identifier">line</span>.<span class="ruby-identifier">match</span>(<span class="ruby-regexp re">/\((.+)\)/</span>)
       <span class="ruby-ivar">@type</span> = <span class="ruby-value str">'IsTrue'</span>
       <span class="ruby-ivar">@condition</span> = <span class="ruby-value str">&quot;.not.(#$1)&quot;</span>
       <span class="ruby-ivar">@message</span> = <span class="ruby-value str">&quot;\&quot;#$1 is not true\&quot;&quot;</span>
       <span class="ruby-identifier">syntaxError</span>(<span class="ruby-value str">&quot;invalid body for #@type&quot;</span>,<span class="ruby-ivar">@suiteName</span>) <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">$1</span><span class="ruby-operator">=~</span><span class="ruby-regexp re">/\S+/</span>
-        <span class="ruby-identifier">writeAssert</span>
+      <span class="ruby-identifier">writeAssert</span>
     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000014" class="method-detail">
-        <a name="M000014"></a>
+      <div id="method-M000015" class="method-detail">
+        <a name="M000015"></a>
 
         <div class="method-heading">
-          <a href="#M000014" class="method-signature">
+          <a href="#M000015" class="method-signature">
           <span class="method-name">writeAssert</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000014-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000014-source">
+            onclick="toggleCode('M000015-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000015-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/funit/assertions.rb, line 61</span>
+<span class="ruby-comment cmt"># File lib/funit/assertions.rb, line 91</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">writeAssert</span>
-      <span class="ruby-value str">&quot;\n! \#@type assertion\nnumAsserts = numAsserts + 1\nif (noAssertFailed) then\nif (\#@condition) then\nprint *, \&quot; *\#@type failed* in test \#@testName &amp;\n&amp;[\#{@suiteName}.fun:\#{@lineNumber.to_s}]\&quot;\nprint *, \&quot;  \&quot;, \#@message\nprint *, \&quot;\&quot;\nnoAssertFailed = .false.\nnumFailures    = numFailures + 1\nelse\nnumAssertsTested = numAssertsTested + 1\nendif\nendif\n&quot;</span>
+      <span class="ruby-value str">&quot;! \#@type assertion\nnumAsserts = numAsserts + 1\nif (noAssertFailed) then\nif (\#@condition) then\nprint *, \&quot; *\#@type failed* in test \#@testName &amp;\n&amp;[\#{@suiteName}.fun:\#{@lineNumber.to_s}]\&quot;\nprint *, \&quot;  \&quot;, \#@message\nprint *, \&quot;\&quot;\nnoAssertFailed = .false.\nnumFailures    = numFailures + 1\nelse\nnumAssertsTested = numAssertsTested + 1\nendif\nendif\n&quot;</span>
     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>