fit 1.1 → 1.2

data/lib/fitlibrary/specify/column_fixture_under_test_with_args.rb

@@ -0,0 +1,17 @@
+# Copyright (c) 2003 Rick Mugridge, University of Auckland, NZ
+# Released under the terms of the GNU General Public License version 2 or later.
+
+require 'fit/column_fixture'
+
+module Fitlibrary
+  module Specify
+  
+  class ColumnFixtureUnderTestWithArgs < Fit::ColumnFixture
+    attr_accessor :third
+    def sum
+      @args[0].to_i + @args[1].to_i + @third
+    end
+  end
+  
+  end
+end

data/lib/fittask.rb

@@ -4,46 +4,42 @@ require 'rake/tasklib'
 require 'fit/file_runner'
 require 'fit/parse'
 
+require 'stringio'
+
 module Rake
 
   class FitReportRunner < Fit::FileRunner
-    def run args
+    def run args, opts=nil
+      @encoding = opts[:encoding].upcase unless opts.nil? 
       process_args args
       process
     end
   end
   
   class FitRunner < Fit::FileRunner
-    def run args
+    def run args, opts=nil
+      @encoding = opts[:encoding].upcase unless opts.nil? 
       process_args args
       process
     end
-    def process_args args
-      input_name = File.expand_path args[0]
-      input_file = File.open input_name
-      @input = input_file.read
-      input_file.close
-      @output = OutputStream.new
+    def check_output_file arg; end
+    def create_output_file output_name
+      @output = StringIO.new
     end
   end
-    
-  # A dummy output stream to avoid creating output files
-  class OutputStream < String
-    def print text; end
-    def close; end
-  end
 
   # Create a task that runs a set of FIT tests.
   #
-  # If rake is invoked with a ATEST command line option, then the list of
+  # If rake is invoked with an ATEST command line option, then the list of
   # test files will be overridden to include only the filename specified on
   # the command line.  This provides an easy way to run just one test.
   # The exact syntax of the ATEST option is as follows:
-  #    ATEST=/path/to/FileHtml:Right:Wrong:Ignores:Exceptions
+  #    ATEST=/path/to/FileHtml:Right:Wrong:Ignores:Exceptions:Encoding
   # where you can include a path to the HTML file, which must be specified
-  # without the .html extension; and where Rights, Wrong, Ignores and
-  # Exceptions are the numbers of the expected results from the test run.
-  # Note that the report path will be the same as the test path.
+  # without the .html extension; where Rights, Wrong, Ignores and Exceptions
+  # are the numbers of the expected results from the test run; and where
+  # Encoding is the character encoding of the input file. Note that the
+  # report path will be the same as the test path.
   #
   class FitTask < TaskLib
   
@@ -58,9 +54,8 @@ module Rake
         atest = ENV['ATEST'].split ':'
         filename = atest[0]
         test_name = File.basename(filename)
-        test = { :name => test_name,
-                 :right => atest[1].to_i, :wrong => atest[2].to_i,
-                 :ignores => atest[3].to_i, :exceptions => atest[4].to_i }
+        test = { :name => test_name, :right => atest[1].to_i, :wrong => atest[2].to_i,
+                 :ignores => atest[3].to_i, :exceptions => atest[4].to_i, :encoding => atest[5] }
         suite = AcceptanceTestSuite.new
         suite << test
         suite.test_path = suite.report_path = File.dirname(filename) + File::SEPARATOR
@@ -116,7 +111,7 @@ module Rake
       end
 
       task task_report_name do 
-         raise 'Tests failed.' if @fail_on_failed_test && @tests_failed
+        raise 'Tests failed.' if @fail_on_failed_test && @tests_failed
       end
 
       self
@@ -141,35 +136,36 @@ module Rake
       def run_tests_with_reports; run_tests true; end;
 
       def run_tests with_report=false 
-         all_passed = true
-         @tests.each do |test|
-            begin
-               runner_args = [@test_path + "#{test[:name]}.html"]
-               puts "Running #{test[:name]}.html"
+        all_passed = true
+        @tests.each do |test|
+          begin
+            runner_args = [@test_path + "#{test[:name]}.html"]
+            puts "Running #{test[:name]}.html"
 
-               if with_report 
-                  report_file=@report_path + "Report_#{test[:name]}.html" 
-                  puts "   (Writing report to #{report_file})"
-                  runner_args << report_file
-                  runner = Rake::FitReportRunner.new
-               else
-                  runner = Rake::FitRunner.new
-               end
-               
-               runner.run runner_args
-               result = runner.fixture.counts
-               verify test, result
-            rescue Exception => e
-               puts "   #{test[:name]} failed: #{e}"
-               all_passed = false
+            if with_report 
+              report_file = @report_path + "Report_#{test[:name]}.html" 
+              puts "   (Writing report to #{report_file})"
+              runner_args << report_file
+              runner = Rake::FitReportRunner.new
+            else
+              runner = Rake::FitRunner.new
             end
-         end
-         all_passed
+
+            opts = test[:encoding].nil? ? nil : {:encoding => test[:encoding]} 
+            runner.run runner_args, opts
+            result = runner.fixture.counts
+            verify test, result
+          rescue Exception => e
+            puts "   #{test[:name]} failed: #{e}"
+            all_passed = false
+          end
+        end
+        all_passed
       end
 
       def verify test, result
-         [:exceptions,:wrong].each { |symbol| test[symbol] = 0 if test[symbol].nil? }
-         [:right, :wrong, :ignores, :exceptions].each do |symbol|
+        [:exceptions, :wrong].each { |symbol| test[symbol] = 0 if test[symbol].nil? }
+        [:right, :wrong, :ignores, :exceptions].each do |symbol|
           count = result.method(symbol).call
           expected = test[symbol]
           unless expected.nil? || count == expected

data/test/all_tests.rb

@@ -3,11 +3,12 @@
 
 require 'test/unit'
 
+require 'test/column_fixture_test'
 require 'test/file_runner_test'
 require 'test/fit_server_test'
 require 'test/fixture_test'
+require 'test/fixture_loader_test'
 #require 'test/framework_test'
 require 'test/parse_test'
 require 'test/scientific_double_test'
 require 'test/type_adapter_test'
-require 'test/fixture_loader_test'

data/test/column_fixture_test.rb

@@ -0,0 +1,26 @@
+# Copyright (c) 2002 Cunningham & Cunningham, Inc.
+# Released under the terms of the GNU General Public License version 2 or later.
+
+require 'test/unit'
+# Make the test run location independent
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'fit/column_fixture'
+
+module Fit
+
+  class ColumnFixtureTest < Test::Unit::TestCase
+
+    # RubyForge bug #22283
+    def test_camel
+      fixture = TestColumnFixture.new
+      header_text = "Execution Data Value"
+      assert_equal "execution_data_value", fixture.camel(header_text)
+    end
+
+    class TestColumnFixture < ColumnFixture
+      public :camel
+    end
+
+  end
+
+end

data/test/file_runner_test.rb

@@ -5,6 +5,7 @@ require 'test/unit'
 # Make the test run location independent
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'fit/file_runner'
+require 'stringio'
 
 module Fit
   
@@ -29,7 +30,7 @@ module Fit
       runner = FileRunner.new
       runner.fixture = TempFixture.new
       runner.input = text
-      runner.output = OutputStream.new
+      runner.output = StringIO.new
       runner.process
 
       assert_equal 'fit.Fixture', $tempParse.leaf.text
@@ -43,10 +44,4 @@ module Fit
     end
   end 
 
-  # A dummy output stream
-  class OutputStream < String
-    def print text; end
-    def close; end
-  end
-
 end

data/test/fixture_loader_test.rb

@@ -13,6 +13,11 @@ require 'eg/all_files'
 require 'eg/nested/bob_the_builder_fixture'
 require 'eg/music/browser'
 
+
+class A; end
+class AFixture < Fit::Fixture; end
+
+
 module Fit
   class FixtureLoaderTest < Test::Unit::TestCase
     def setup
@@ -42,20 +47,25 @@ module Fit
     end 
     def test_it_finds_fixtures_in_the_fit_module
       assert_instance_of(Fit::ImportFixture, @loader.load('ImportFixture'))
-    end        
+    end
     def test_it_adds_fixture_to_the_end_if_it_cant_find_the_class
       assert_instance_of(Fit::ImportFixture, @loader.load('Import'))
     end
-    def test_it_camalizes_seperated_words
+    def test_it_camelizes_separated_words
       FixtureLoader.add_fixture_package('Eg::Nested')
       assert_instance_of(Eg::Nested::BobTheBuilderFixture, @loader.load('bob the builder fixture'))
       assert_instance_of(Eg::Nested::BobTheBuilderFixture, @loader.load('bob the builder'))
     end
-    def test_punctuation_seperates_words
+    def test_punctuation_separates_words
       FixtureLoader.add_fixture_package('Eg::Nested')
       assert_instance_of(Eg::Nested::BobTheBuilderFixture, @loader.load('bob_the!-builder,fixture.'))
       assert_instance_of(Eg::Nested::BobTheBuilderFixture, @loader.load('bob_the!-builder.'))
     end
+    def test_import_packages_are_unique
+       FixtureLoader.add_fixture_package('Eg::Nested')
+       FixtureLoader.add_fixture_package('Eg::Nested')
+       assert_equal(1, FixtureLoader.fixture_packages.find_all { |e| e =~ /^Eg::Nested/}.size)
+    end
     def test_it_raises_when_it_cant_find_the_fixture
       @loader.load "NoSuchClass"
     rescue StandardError => e
@@ -67,5 +77,8 @@ module Fit
     rescue StandardError => e
       assert_equal("String is not a fixture.", e.to_s)
     end
+    def test_loading_fixture_when_fixture_name_is_same_as_another_class_name
+      assert_instance_of(AFixture, @loader.load('A'))
+    end
   end
 end

data/test/parse_test.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2002 Cunningham & Cunningham, Inc.
 # Released under the terms of the GNU General Public License version 2 or later.
 
@@ -71,7 +72,7 @@ module Fit
       assert_equal 'a', Parse.html_to_text('a  ')
       assert_equal ' ', Parse.html_to_text(' ')
       assert_equal '1     2', Parse.html_to_text('1     2')
-      assert_equal '1     2', Parse.html_to_text("1 \xa0\xa0\xa0\xa02")
+      assert_equal '1     2', Parse.html_to_text("1 \302\240\302\240\302\240\302\2402")
       assert_equal 'a', Parse.html_to_text('  <tag />a')
       assert_equal "a\nb", Parse.html_to_text('a<br />b')
       assert_equal 'ab', Parse.html_to_text('<font size=+1>a</font>b')
@@ -86,7 +87,21 @@ module Fit
       assert_equal 'a>b & b>c &&', Parse.unescape('a&gt;b&nbsp;&amp;&nbsp;b>c &&')
       assert_equal '&amp;&amp;', Parse.unescape('&amp;amp;&amp;amp;')
       assert_equal 'a>b & b>c &&', Parse.unescape('a&gt;b&nbsp;&amp;&nbsp;b>c &&')
-      assert_equal "'\"\"'", Parse.unescape("\221��\222")
+      assert_equal "'\"\"'", Parse.unescape("\342\200\230\342\200\234\342\200\235\342\200\231")
+      assert_equal 'no-entity', Parse.unescape('no-entity')
+    end
+    def test_unescape_numeric_entities
+      assert_equal 'A', Parse.unescape('&#65;')
+      assert_equal 'A', Parse.unescape('&#x41;')
+      assert_equal 'A', Parse.unescape('&#X41;')
+      assert_equal '!A!', Parse.unescape('!&#65;!')
+      assert_equal 'AB', Parse.unescape('&#65;&#66;')
+      assert_equal '1A2B3', Parse.unescape('1&#65;2&#66;3')
+      assert_equal '&#65', Parse.unescape('&#65')
+      assert_equal '&#foo;', Parse.unescape('&#foo;')
+      assert_equal '1&#foo;2', Parse.unescape('1&#foo;2')
+      assert_equal "\357\277\277", Parse.unescape('&#65535;')
+      assert_equal '&#65536;', Parse.unescape('&#65536;')
     end
     def test_whitespace_is_condensed
       assert_equal 'a b', Parse.condense_whitespace(' a  b  ')
@@ -94,7 +109,7 @@ module Fit
       assert_equal '', Parse.condense_whitespace(' ')
       assert_equal '', Parse.condense_whitespace('  ')
       assert_equal '', Parse.condense_whitespace('   ')
-      assert_equal '', Parse.condense_whitespace("\240")
+      assert_equal '', Parse.condense_whitespace("\302\240")
     end
   end
 

data/test/type_adapter_test.rb

@@ -51,20 +51,34 @@ module Fit
       adapter = TypeAdapter.for @f, 'sample_integer', false
       assert_equal '-234567', adapter.parse('-234567').to_s
     end
-    def test_method
-      adapter = TypeAdapter.for @f, 'pi', true
-      assert_in_delta 3.14159, adapter.get, 0.00001
-      assert_equal 3.14159265, adapter.get
+    def test_double
+      adapter = TypeAdapter.for @f, 'sample_float', false
+      adapter.set(adapter.parse('6.02e23'))
+      assert_in_delta 6.02e23, @f.sample_float, 1e17
+    end
+    def test_bad_float
+      ['.', '3.', '.|0'].each do |bad_float|
+        adapter = TypeAdapter.for @f, 'sample_float', false
+        adapter.set(adapter.parse(bad_float))
+        assert_equal bad_float, @f.sample_float
+      end
     end
     def test_string
       adapter = TypeAdapter.for @f, 'sample_string', false
       adapter.set(adapter.parse('xyzzy'))
       assert_equal 'xyzzy', @f.sample_string
     end
-    def test_double
-      adapter = TypeAdapter.for @f, 'sample_float', false
-      adapter.set(adapter.parse('6.02e23'))
-      assert_in_delta 6.02e23, @f.sample_float, 1e17
+    def test_multiline_string_with_numbers
+      ["foo\n1", "foo\n1.0"].each do |s|
+        adapter = TypeAdapter.for @f, 'sample_string', false
+        adapter.set(adapter.parse(s))
+        assert_equal s, @f.sample_string
+      end
+    end
+    def test_method
+      adapter = TypeAdapter.for @f, 'pi', true
+      assert_in_delta 3.14159, adapter.get, 0.00001
+      assert_equal 3.14159265, adapter.get
     end
     def test_array
       adapter = TypeAdapter.for @f, 'sample_array', false
@@ -72,49 +86,49 @@ module Fit
       assert_equal 1, @f.sample_array[0]
       assert_equal 2, @f.sample_array[1]
       assert_equal 3, @f.sample_array[2]
-      assert_equal '123', adapter.to_s(@f.sample_array)
+      assert_equal '1, 2, 3', adapter.to_s(@f.sample_array)
       assert_equal [1,2,3], @f.sample_array
     end
     def test_boolean
       verify_sample_boolean_adapter_setter @f, 'sample_boolean'
     end
     def verify_sample_boolean_adapter_setter(fixture,method)
-       adapter = TypeAdapter.for fixture, method, false
-       adapter.set(adapter.parse('true'))
-       assert fixture.sample_boolean
-       adapter.set(adapter.parse('false'))
-       assert !fixture.sample_boolean
-    end
-      def test_digits_in_the_name
-         adapter = TypeAdapter.for @f, "sample_with_2_digits1", false
-         adapter.set(adapter.parse('true'))
-         assert @f.sample_with_2_digits1
-         adapter.set(adapter.parse('false'))
-         assert !@f.sample_with_2_digits1
-      end
-      def test_graceful_names_setters
-         ['SampleBoolean','Sample Boolean','sample boolean','sample? boolean','sample, boolean','sample, boolean?'].each do |name|
-            verify_sample_boolean_adapter_setter @f, name
-         end
-      end
-      def test_graceful_names_getters
-         ['sample boolean()','sample_boolean()','Sample Boolean()','SampleBoolean()',
-         'sample boolean?','sample_boolean?','Sample Boolean?','SampleBoolean?','Sample.boolean'].each do |name|
-            adapter=TypeAdapter.for @f, name
-            [true,false].each { |v| @f.sample_boolean=v; assert_equal(v,adapter.get) }
-         end
+      adapter = TypeAdapter.for fixture, method, false
+      adapter.set(adapter.parse('true'))
+      assert fixture.sample_boolean
+      adapter.set(adapter.parse('false'))
+      assert !fixture.sample_boolean
+    end
+    def test_digits_in_the_name
+      adapter = TypeAdapter.for @f, "sample_with_2_digits1", false
+      adapter.set(adapter.parse('true'))
+      assert @f.sample_with_2_digits1
+      adapter.set(adapter.parse('false'))
+      assert !@f.sample_with_2_digits1
+    end
+    def test_graceful_names_setters
+      ['SampleBoolean','Sample Boolean','sample boolean','sample? boolean','sample, boolean','sample, boolean?'].each do |name|
+         verify_sample_boolean_adapter_setter @f, name
       end
-      def test_getters_ending_with_question_mark
-         # when the request ends in ?, prefer a method ending in ?
-         adapter = TypeAdapter.for @f, "might_end_in_qm?"
-         assert adapter.get
-         # when the request doesn't end in ?, require a method not ending with ?
-         adapter = TypeAdapter.for @f, "might_end_in_qm"
-         assert ! adapter.get
-         # when the request ends in ? accept a method not ending in ?, if one ending in ? is not present
-         @f.sample_string='no qm'
-         adapter = TypeAdapter.for @f, "sample_string?"
-         assert_equal 'no qm',adapter.get
+    end
+    def test_graceful_names_getters
+      ['sample boolean()','sample_boolean()','Sample Boolean()','SampleBoolean()',
+       'sample boolean?','sample_boolean?','Sample Boolean?','SampleBoolean?','Sample.boolean'].each do |name|
+         adapter = TypeAdapter.for @f, name
+         [true, false].each { |v| @f.sample_boolean = v; assert_equal(v, adapter.get) }
       end
+    end
+    def test_getters_ending_with_question_mark
+      # when the request ends in ?, prefer a method ending in ?
+      adapter = TypeAdapter.for @f, "might_end_in_qm?"
+      assert adapter.get
+      # when the request doesn't end in ?, require a method not ending with ?
+      adapter = TypeAdapter.for @f, "might_end_in_qm"
+      assert ! adapter.get
+      # when the request ends in ? accept a method not ending in ?, if one ending in ? is not present
+      @f.sample_string = 'no qm'
+      adapter = TypeAdapter.for @f, "sample_string?"
+      assert_equal 'no qm', adapter.get
+    end
   end
 end