rspec 0.5.9 → 0.5.10

data/lib/spec/test_to_spec/test_case_ext.rb

@@ -0,0 +1,22 @@
+require 'rubygems'
+require 'parse_tree'
+require 'spec/test_to_spec/sexp_transformer'
+require 'spec/test_to_spec/ruby2ruby'
+
+module Test
+  module Unit
+    class TestCase
+      # Returns a String representing the RSpec translation of this class
+      def self.to_rspec
+        tree = ParseTree.new.parse_tree(self).first
+        rspec_tree = Spec::TestToSpec::SexpTransformer.new.process(tree)
+        modules = self.name.split("::")[0..-2]
+        result = ""
+        result += modules.collect{|m| "module #{m}\n"}.join("")
+        result += RubyToRuby.new.process(rspec_tree[0])
+        result += modules.collect{|m| "\nend"}.join("")
+        result
+      end
+    end
+  end
+end

data/lib/spec/{tool → test_to_spec}/translation_test_runner.rb

@@ -1,9 +1,9 @@
-require 'spec/tool/test_unit_translator'
+require 'spec/test_to_spec/test_case_ext'
 require 'fileutils'
 require 'erb'
 
 module Spec
-  module Tool
+  module TestToSpec
     # A Test::Unit runner that doesn't run tests, but translates them instead!
     class TranslationTestRunner
       include FileUtils
@@ -14,11 +14,10 @@ module Spec
       
       def initialize(suite)
         log "Writing translated specs to #{$test2spec_options[:specdir]}"
-        translator = TestUnitTranslator.new
         ObjectSpace.each_object(Class) do |klass|
           if klass < ::Test::Unit::TestCase
             begin
-              translation = translator.translate(klass)
+              translation = klass.to_rspec
               
               unless $test2spec_options[:dry_run]
                 relative_path = underscore(klass.name)

data/lib/spec/version.rb

@@ -3,7 +3,7 @@ module Spec
     unless defined? MAJOR
       MAJOR  = 0
       MINOR  = 5
-      TINY   = 9
+      TINY   = 10
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG    = "REL_" + [MAJOR, MINOR, TINY].join('_')

data/test/spec/runner/progress_bar_formatter_test.rb

@@ -29,8 +29,8 @@ module Spec
       end
       
       def test_should_produce_standard_summary
-        @formatter.dump_summary(4,3,2,1)
-        assert_equal("\nFinished in 4 seconds\n\n3 contexts, 2 specifications, 1 failure\n", @io.string)
+        @formatter.dump_summary(3,2,1)
+        assert_equal("\nFinished in 3 seconds\n\n2 specifications, 1 failure\n", @io.string)
       end
 
       def test_should_produce_line_break_on_start_dump
@@ -46,7 +46,7 @@ module Spec
       end
       
       def test_should_not_produce_summary_on_dry_run
-        @formatter.dump_summary(4,3,2,1)
+        @formatter.dump_summary(3,2,1)
         assert_equal("", @io.string)
       end
     end

data/test/spec/runner/rdoc_formatter_test.rb

@@ -24,7 +24,7 @@ module Spec
       end
       
       def test_should_produce_no_summary
-        @formatter.dump_summary(nil,nil,nil,nil)
+        @formatter.dump_summary(nil,nil,nil)
         assert(@io.string.empty?)
       end
 
@@ -41,7 +41,7 @@ module Spec
       end
       
       def test_should_not_produce_summary_on_dry_run
-        @formatter.dump_summary(4,3,2,1)
+        @formatter.dump_summary(3,2,1)
         assert_equal("", @io.string)
       end
     end

data/test/spec/runner/reporter_test.rb

@@ -14,7 +14,7 @@ module Spec
       def test_should_push_time_to_reporter
         @formatter.should_receive(:start).with(5)
         @formatter.should_receive(:start_dump)
-        @formatter.should_receive(:dump_summary) do |time, a, b, c|
+        @formatter.should_receive(:dump_summary) do |time, a, b|
           assert_match(/[0-9].[0-9|e|-]+/, time.to_s)
         end
         @reporter.start(5)
@@ -24,7 +24,7 @@ module Spec
       
       def test_should_push_stats_to_reporter_even_with_no_data
         @formatter.should_receive(:start_dump)
-        @formatter.should_receive(:dump_summary).with(:anything, 0, 0, 0)
+        @formatter.should_receive(:dump_summary).with(:anything, 0, 0)
         @reporter.dump
       end
       
@@ -42,7 +42,7 @@ module Spec
         @formatter.should_receive(:spec_started)
         @formatter.should_receive(:spec_passed)
         @formatter.should_receive(:start_dump)
-        @formatter.should_receive(:dump_summary).with(:anything, 0, 1, 0)
+        @formatter.should_receive(:dump_summary).with(:anything, 1, 0)
         @reporter.spec_started "spec"
         @reporter.spec_finished "spec"
         @reporter.dump
@@ -54,7 +54,7 @@ module Spec
         @formatter.should_receive(:spec_failed).with("spec", 1, failure)
         @formatter.should_receive(:start_dump)
         @formatter.should_receive(:dump_failure).with(1, :anything)
-        @formatter.should_receive(:dump_summary).with(:anything, 1, 1, 1)
+        @formatter.should_receive(:dump_summary).with(:anything, 1, 1)
         @backtrace_tweaker.should.receive(:tweak_backtrace)
         @reporter.add_context "context"
         @reporter.spec_started "spec"
@@ -63,13 +63,20 @@ module Spec
       end
       
       def test_should_handle_multiple_contexts_same_name
-        @formatter.should_receive(:add_context).with("context", true)
-        @formatter.should_receive(:add_context).with("context", false).exactly(2).times
+        @formatter.should_receive(:add_context).exactly(3).times
+        @formatter.should.receive(:spec_started).exactly(3).times
+        @formatter.should.receive(:spec_passed).exactly(3).times
         @formatter.should_receive(:start_dump)
-        @formatter.should_receive(:dump_summary).with(:anything, 3, 0, 0)
+        @formatter.should_receive(:dump_summary).with(:anything, 3, 0)
         @reporter.add_context "context"
+        @reporter.spec_started "spec 1"
+        @reporter.spec_finished "spec 1"
         @reporter.add_context "context"
+        @reporter.spec_started "spec 2"
+        @reporter.spec_finished "spec 2"
         @reporter.add_context "context"
+        @reporter.spec_started "spec 3"
+        @reporter.spec_finished "spec 3"
         @reporter.dump
       end
   
@@ -82,7 +89,7 @@ module Spec
         @formatter.should_receive(:spec_failed).with("spec", 2, failure)
         @formatter.should_receive(:dump_failure).exactly(2).times
         @formatter.should_receive(:start_dump)
-        @formatter.should_receive(:dump_summary).with(:anything, 2, 4, 2)
+        @formatter.should_receive(:dump_summary).with(:anything, 4, 2)
         @backtrace_tweaker.should.receive(:tweak_backtrace)
         @reporter.add_context "context"
 

data/test/spec/runner/specdoc_formatter_test.rb

@@ -24,8 +24,8 @@ module Spec
       end
 
       def test_should_produce_standard_summary
-        @formatter.dump_summary(4,3,2,1)
-        assert_equal("\nFinished in 4 seconds\n\n3 contexts, 2 specifications, 1 failure\n", @io.string)
+        @formatter.dump_summary(3,2,1)
+        assert_equal("\nFinished in 3 seconds\n\n2 specifications, 1 failure\n", @io.string)
       end
 
       def test_should_push_nothing_on_start
@@ -47,7 +47,7 @@ module Spec
       end
       
       def test_should_not_produce_summary_on_dry_run
-        @formatter.dump_summary(4,3,2,1)
+        @formatter.dump_summary(3,2,1)
         assert_equal("", @io.string)
       end
     end

data/test/spec/{tool → test_to_spec}/ruby_to_ruby_test.rb

@@ -1,5 +1,5 @@
-require 'test/unit'
-require 'spec/tool/ruby2ruby'
+require File.dirname(__FILE__) + '/../../test_helper'
+require 'spec/test_to_spec/ruby2ruby'
 
 R2r2r = RubyToRuby.translate(RubyToRuby).sub("RubyToRuby","RubyToRubyToRuby")
 eval R2r2r

data/test/spec/test_to_spec/sexp_transformer_assertion_test.rb

@@ -0,0 +1,207 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+require 'test/unit'
+require 'rubygems'
+require 'parse_tree'
+require 'spec/test_to_spec/sexp_transformer'
+
+module Spec
+  module TestToSpec
+    # This Test::Unit class verifies that the core Test::Unit assertions
+    # can be translated to RSpec.
+    # The various test_assert_* methods must follow a rigorous form - 
+    #
+    # The first statement must be a Test::Unit assertion, and the second
+    # statement its expected RSpec translation.
+    #
+    # For each of the test_assert_* method, a test_assert_*_translation
+    # method is dynamically added, which will test that the translation
+    # of the 1st statement is effectively equal to the second one.
+    class SexpTransformerAssertionTest < Test::Unit::TestCase
+      def setup
+        @t = SexpTransformer.new
+      end
+      
+      def test_assert
+        assert(:foo == :foo)
+        (:foo == :foo).should_be true
+      end
+
+      def test_assert_with_message
+        assert(:foo == :foo, "msg")
+        (:foo == :foo).should_be true
+      end
+
+      def test_assert_nil
+        assert_nil([].index(5))
+        ([].index(5)).should_be nil
+      end
+
+      def test_assert_nil_with_message
+        assert_nil([].index(5), "msg")
+        ([].index(5)).should_be nil
+      end
+
+      def test_assert_not_nil
+        assert_not_nil([5].index(5))
+        ([5].index(5)).should_not_be nil
+      end
+
+      def test_assert_not_nil_with_message
+        assert_not_nil(3, "msg")
+        3.should_not_be nil
+      end
+
+      def test_assert_equal
+        assert_equal(2, 1+1)
+        (1+1).should_equal 2
+      end
+
+      def test_assert_equal_with_message
+        assert_equal(2, 1+1, "1+1 should equal 2")
+        (1+1).should_equal 2
+      end
+
+      def test_assert_equal_with_each
+        [0,1,2].each_with_index do |b, c|
+          assert_equal c, b
+        end
+        [0,1,2].each_with_index do |b, c|
+          b.should_equal c
+        end
+      end
+
+      def test_assert_not_equal
+        assert_not_equal(2+3, 1)
+        1.should_not_equal 2+3
+      end
+
+      def test_assert_not_equal_with_message
+        assert_not_equal(2+3, 1, "msg")
+        1.should_not_equal 2+3
+      end
+
+      def test_assert_same
+        assert_same(2, 1+1)
+        (1+1).should_be 2
+      end
+
+      def test_assert_same_with_msg
+        assert_same(2, 1+1, "msg")
+        (1+1).should_be 2
+      end
+
+      def test_assert_not_same
+        assert_not_same(2+3, 1)
+        1.should_not_be 2+3
+      end
+
+      def test_assert_not_same_with_message
+        assert_not_same(2+3, 1, "msg")
+        1.should_not_be 2+3
+      end
+
+      def test_assert_instance_of
+        assert_instance_of Fixnum, 2
+        2.should_be_instance_of Fixnum
+      end
+
+      def test_assert_kind_of
+        assert_kind_of Fixnum, 2
+        2.should_be_kind_of Fixnum
+      end
+
+      def test_assert_match
+        assert_match /foo/, 'foo'
+        'foo'.should_match /foo/
+      end
+
+      def test_assert_no_match
+        assert_no_match /foo/, 'bar'
+        'bar'.should_not_match /foo/
+      end
+
+      def test_assert_respond_to
+        assert_respond_to 2, :to_f
+        2.should_respond_to :to_f
+      end
+      
+      def test_assert_respond_to_with_message
+        assert_respond_to 2, :to_f, "msg"
+        2.should_respond_to :to_f
+      end
+      
+      def test_assert_in_delta
+        assert_in_delta 123.5, 123.45, 0.1
+        123.45.should_be_close 123.5, 0.1
+      end
+
+      def test_assert_in_delta_with_message
+        assert_in_delta 123.5, 123.45, 0.1, "123.45 should be close to 123.5"
+        123.45.should_be_close 123.5, 0.1
+      end
+      
+      def test_assert_raise
+        assert_raise(ZeroDivisionError){ 1/0 }
+        lambda {1/0}.should_raise(ZeroDivisionError)
+      end
+      
+      def test_assert_raise_with_message
+        assert_raise(ZeroDivisionError, "msg"){ 1/0 }
+        lambda {1/0}.should_raise(ZeroDivisionError)
+      end
+      
+      def test_assert_raises
+        assert_raises(ZeroDivisionError){ 1/0 }
+        lambda {1/0}.should_raise(ZeroDivisionError)
+      end
+      
+      def test_assert_nothing_raised
+        assert_nothing_raised{ 0/1 }
+        lambda {0/1}.should_not_raise
+      end
+
+      def test_assert_throws
+        assert_throws(:foo){ throw :foo }
+        lambda {throw :foo}.should_throw(:foo)
+      end
+
+      def test_assert_nothing_thrown
+        assert_nothing_thrown{ 0/1 }
+        lambda {0/1}.should_not_throw
+      end
+      
+      def test_assert_block
+        assert_block{:foo != :bar}
+        lambda{:foo != :bar}.should_be true
+      end
+
+      # Returns the body of one of my methods as a Sexp
+      def self.body(sym)
+        t = ParseTree.new.parse_tree_for_method(self, sym)
+        t[2][1][2..-1]
+      end
+
+      # Verifies that the 1st statement in test method +m+ is properly translated
+      # to the 2nd statement.
+      def should_translate(m)
+        body = self.class.body(m)
+        assert_equal 2, body.length
+        test_unit_sexp = body[0]
+        rspec_sexp = body[1]
+        translation = @t.process(test_unit_sexp)
+        verify_sexp_equal(rspec_sexp, translation)
+      end
+      
+      # Dynamically define extra test methods
+      methods = self.instance_methods(false).reject do |m| 
+        m == "test_translations" || !(m =~ /^test_assert/)
+      end
+      methods.each do |m|
+        define_method "#{m}_translation" do
+          should_translate(m)
+        end
+      end
+
+    end
+  end
+end

data/test/spec/test_to_spec/sexp_transformer_test.rb

@@ -0,0 +1,232 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+require 'test/unit'
+require 'rubygems'
+require 'parse_tree'
+require 'spec/test_to_spec/sexp_transformer'
+require 'spec/test_to_spec/ruby2ruby'
+
+module Spec
+  module TestToSpec
+    class FirstTest < Test::Unit::TestCase
+      def test_foo
+      end
+    end
+    class FirstContext
+      def wrapper
+        context "First" do
+          specify "foo" do
+          end
+        end
+      end
+    end
+
+    class SecondTest < Test::Unit::TestCase
+      def test_foo
+        assert_same 3, 1+2
+        assert_match /sla/, 'aslak'
+      end
+    end
+    class SecondContext
+      def wrapper
+        context "Second" do
+          specify "foo" do
+            (1+2).should_be 3
+            'aslak'.should_match(/sla/)
+          end
+        end
+      end
+    end
+
+    class ThirdTest < Test::Unit::TestCase
+      def test_bar
+        one = 1
+        two = 2
+      end
+      def test_foo
+      end
+    end
+    class ThirdContext
+      def wrapper
+        context "Third" do
+          specify "bar" do
+            one = 1
+            two = 2
+          end
+          specify "foo" do
+          end
+        end
+      end
+    end
+
+    class FourthTest < Test::Unit::TestCase
+      def setup
+        one = 1
+      end
+      def test_foo
+        two = 2
+      end
+    end
+    class FourthContext
+      def wrapper
+        context "Fourth" do
+          setup do
+            one = 1
+          end
+          specify "foo" do
+            two = 2
+          end
+        end
+      end
+    end
+
+    class FifthTest
+      def setup
+        one = 1
+      end
+      def foo
+        two = 2
+      end
+    end
+    class FifthContext
+      def wrapper
+        context "Fifth" do
+          setup do
+            one = 1
+            def foo
+              two = 2
+            end
+          end
+        end
+      end
+    end
+
+    class SixthTest
+      def setup
+      end
+      def foo
+        two = 2
+      end
+    end
+    class SixthContext
+      def wrapper
+        context "Sixth" do
+          setup do
+            def foo
+              two = 2
+            end
+          end
+        end
+      end
+    end
+
+    class SeventhTest
+      def foo
+        two = 2
+      end
+    end
+    class SeventhContext
+      def wrapper
+        context "Seventh" do
+          setup do
+            def foo
+              two = 2
+            end
+          end
+        end
+      end
+    end
+
+    class EighthTest < Test::Unit::TestCase
+      def foo
+        two = 2
+      end
+
+      def teardown
+        torn = true
+      end
+      
+      def test_foo
+        bar = foo
+        assert_equal 2, bar
+      end
+    end
+    class EighthContext
+      def wrapper
+        context "Eighth" do
+          setup do
+            def foo
+              two = 2
+            end
+          end
+          teardown do
+            torn = true
+          end
+          specify "foo" do
+            bar = foo
+            bar.should_equal 2
+          end
+        end
+      end
+    end
+
+    class SexpTransformerTest < Test::Unit::TestCase
+      def test_first
+        should_translate_class_to_context('First')
+      end
+
+      def test_second
+        should_translate_class_to_context('Second')
+      end
+
+      def test_third
+        should_translate_class_to_context('Third')
+      end
+
+      def test_fourth
+        should_translate_class_to_context('Fourth')
+      end
+
+      def test_fifth
+        should_translate_class_to_context('Fifth')
+      end
+
+      def test_sixth
+        should_translate_class_to_context('Sixth')
+      end
+
+      def test_seventh
+        should_translate_class_to_context('Seventh')
+      end
+
+      def test_eighth
+        should_translate_class_to_context('Eighth')
+      end
+
+      def should_translate_class_to_context(name)
+        t = test_class_exp(eval("#{name}Test"))
+        c = context_exp(eval("#{name}Context"))
+
+        trans = @t.process(t)
+        verify_sexp_equal c, trans
+        
+        # Verify that we can evaluate it after translated by R2R
+        eval(@r2r.process(trans[0]))
+      end
+
+      def test_class_exp(klass)
+        ParseTree.new.parse_tree(klass)[0]
+      end
+
+      def context_exp(klass)
+#pp ParseTree.new.parse_tree_for_method(klass, :wrapper)
+#exit
+        ParseTree.new.parse_tree_for_method(klass, :wrapper)[2][1][2..-1]
+      end
+
+      def setup
+        @t = SexpTransformer.new
+        @r2r = RubyToRuby.new
+      end
+    end
+  end
+end