rspec 0.5.7 → 0.5.8

data/test/spec/runner/specdoc_formatter_test.rb

@@ -19,7 +19,7 @@ module Spec
       end
 
       def test_should_push_failing_spec_name_and_failure_number
-        @formatter.spec_failed("spec", 98)
+        @formatter.spec_failed("spec", 98, nil)
         assert_equal("- spec (FAILED - 98)\n", @io.string)
       end
 

data/test/spec/runner/specification_test.rb

@@ -12,12 +12,14 @@ module Spec
           self.should.not.be.instance_of Specification
           self.should.be.instance_of ExecutionContext
         end
+        @reporter.should.receive(:spec_started).with "should pass"
         @reporter.should.receive(:spec_finished).with "should pass", nil, nil
         spec.run @reporter
       end
 
       def test_should_add_itself_to_reporter_when_passes
         spec = Specification.new("spec") {}
+        @reporter.should.receive(:spec_started).with "spec"
         @reporter.should.receive(:spec_finished).with "spec", nil, nil
         spec.run(@reporter)
       end
@@ -25,12 +27,14 @@ module Spec
       def test_should_add_itself_to_reporter_when_fails
         error = RuntimeError.new
         spec = Specification.new("spec") { raise error }
+        @reporter.should.receive(:spec_started).with "spec"
         @reporter.should.receive(:spec_finished).with "spec", error, "spec"
         spec.run(@reporter)
       end
       
       def test_should_add_itself_to_reporter_when_calling_run_dry
         spec = Specification.new("spec") {}
+        @reporter.should.receive(:spec_started).with "spec"
         @reporter.should.receive(:spec_finished).with "spec"
         spec.run(@reporter, nil, nil, true)
       end
@@ -40,6 +44,7 @@ module Spec
           mock = mock("a mock")
           mock.should.receive(:poke)
         end
+        @reporter.should.receive(:spec_started).with "spec"
         @reporter.should.receive(:spec_finished) do |spec_name, error|
           spec_name.should.equal "spec"
           error.message.should.match /expected 'poke' once, but received it 0 times/
@@ -54,6 +59,7 @@ module Spec
         teardown = lambda do
           raise "in teardown"
         end
+        @reporter.should.receive(:spec_started).with "spec"
         @reporter.should.receive(:spec_finished) do |spec, error, location|
           spec.should.equal "spec"
           location.should.equal "spec" 
@@ -68,6 +74,7 @@ module Spec
         setup = lambda do
           raise "in setup"
         end
+        @reporter.should.receive(:spec_started).with "spec"
         @reporter.should.receive(:spec_finished) do |name, error, location|
           name.should.equal "spec"
           error.message.should.equal "in setup"
@@ -82,6 +89,7 @@ module Spec
         teardown = lambda do
           raise "in teardown"
         end
+        @reporter.should.receive(:spec_started).with "spec"
         @reporter.should.receive(:spec_finished) do |name, error, location|
           name.should.equal "spec"
           error.message.should.equal "in teardown"

data/test/spec/tool/ruby_to_ruby_test.rb

@@ -0,0 +1,79 @@
+require 'test/unit'
+require 'spec/tool/ruby2ruby'
+
+R2r2r = RubyToRuby.translate(RubyToRuby).sub("RubyToRuby","RubyToRubyToRuby")
+eval R2r2r
+
+class RubyToRubyToRuby
+  class<<self
+    eval RubyToRuby.translate(class<<RubyToRuby;self;end, :translate)
+  end
+  eval RubyToRuby.translate(RubyToRuby, :initialize)
+end
+
+class R2RTest < Test::Unit::TestCase
+
+  def test_self_translation
+    r2r2r2 = RubyToRubyToRuby.translate(RubyToRuby).sub("RubyToRuby","RubyToRubyToRuby")
+    r2r2r2r = RubyToRubyToRuby.translate(RubyToRubyToRuby)
+    # File.open('1','w'){|f| f.write r2r2r}
+    # File.open('2','w'){|f| f.write r2r2r2}
+    # File.open('3','w'){|f| f.write r2r2r2r}
+    assert_equal(R2r2r,r2r2r2)
+    assert_equal(R2r2r,r2r2r2r)
+  end
+  
+  def hairy_method(z,x=10,y=20*z.abs,&blok)
+    n = 1 + 2 * 40.0 / (z - 2)
+    retried = false
+    begin
+      raise ArgumentError, n if retried
+      n -= yield x,y,z,[z,x,y].map(&blok)
+      n /= 1.1 until n < 500
+      n = "hop hop #{"%.4f" % n}"
+      raise n
+    rescue RuntimeError => e
+      raise if n != e.message
+      n = lambda{|i| 
+        lambda{|j| "#{i} #{z+2*2} #{j.message.reverse}"
+        }
+      }[n].call(e)
+      unless retried
+        retried = true
+        retry
+      end
+    rescue ArgumentError => e
+      e.message  
+    rescue
+    end
+  ensure
+    x << "ensure a-working"
+  end
+  
+  def foobar a, &block; block.call(a) end
+  def k; foobar [1,2,3].each { |x| x*2 } do |x| x*2 end end
+
+  def test_block_predecence_escape
+    eval RubyToRuby.translate(self.class, :k).sub(" k"," l")
+    assert_equal(k, l)
+  end
+       
+  def test_hairy_method
+    eval RubyToRuby.translate(self.class, :hairy_method).sub(" h", " f")
+    
+    blk = lambda{|x,y,z,arr| 
+      unless y
+        x.to_i*2
+      else
+        x.to_i*y*z*arr.inject(1){|s,i| s+i}
+      end
+    }
+    x1 = ""
+    x2 = ""
+    res = [hairy_method(-5,x1,&blk), fairy_method(-5,x2,&blk)]
+    assert_equal(res.first, res.last)
+    assert_equal(x1, x2)
+    assert_equal("ensure a-working", x1)
+  end
+  
+end

data/test/spec/tool/test_unit_api_spec.rb

@@ -1,25 +1,25 @@
-require 'spec'
-
 module Spec
   module Tool
     context "TestUnitApi" do
-
       setup do
         @an_int = 789
       end
 
       teardown do
+        nil
       end
 
-      specify "Can be translated to rspec" do
+      specify "can be translated to rspec" do
         a_float = 123.45
         a_nil = nil
-
+        true.should_be true
         @an_int.should_not_be nil
-        lambda { true }.should_be true
-        lambda do
+        lambda {
+          true 
+        }.should_be true
+        lambda {
           true
-        end.should_be true
+        }.should_be true
         @an_int.should_equal 789
         a_float.should_be_close 123.5, 0.1
         @an_int.should_be_instance_of Fixnum
@@ -30,32 +30,46 @@ module Spec
         @an_int.should_not_equal 780
         @an_int.should_not_be nil
         a_float.should_not_be @an_int
-        lambda { foo = 1 }.should_not_raise
-        lambda do
-          foo = 2
-        end.should_not_raise
-        lambda { foo = 3 }.should_not_throw
-        lambda do
-          foo = 4
-        end.should_not_throw
-        #assert_operator       object1, operator, object2, "a message"
-        lambda { raise NotImplementedError }.should_raise NotImplementedError
-        lambda do
-          raise NotImplementedError
-        end.should_raise NotImplementedError
-        lambda { raise NotImplementedError }.should_raise NotImplementedError
-        lambda do
-          raise NotImplementedError
-        end.should_raise NotImplementedError
+        lambda {
+          foo = 1 
+        }.should_not_raise
+        lambda {
+          bar = 2
+        }.should_not_raise
+        [2].each {|a|
+          a.should_equal 2
+        }
+        [0,1,2].each_with_index {|b, c|
+          b.should_equal c
+        }
+        lambda {
+          zip = 3 
+        }.should_not_throw
+        lambda {
+          zap = 4
+        }.should_not_throw
+        lambda {
+          raise(NotImplementedError)
+        }.should_raise(NotImplementedError)
+        lambda {
+          raise(NotImplementedError)
+        }.should_raise(NotImplementedError)
+        lambda {
+          raise(NotImplementedError)
+        }.should_raise(NotImplementedError)
+        lambda {
+          raise(NotImplementedError)
+        }.should_raise(NotImplementedError)
         @an_int.should_respond_to :to_f
         a_float.should_be a_float
-        #assert_send send_array, "a message"
-        lambda { throw :foo }.should_throw :foo
-        lambda do
-          throw :foo
-        end.should_throw :foo
-
+        lambda {
+          throw(:foo) 
+        }.should_throw(:foo)
+        lambda {
+          throw(:foo)
+        }.should_throw(:foo)
       end
+
     end
   end
 end

data/test/spec/tool/test_unit_api_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../test_helper'
+require 'test/unit'
 
 module Spec
   module Tool
@@ -15,7 +15,8 @@ module Spec
         a_float = 123.45
         a_nil = nil
 
-        assert @an_int
+        assert true
+        assert_not_nil @an_int
         assert_block { true }
         assert_block do
           true
@@ -32,11 +33,17 @@ module Spec
         assert_not_same       @an_int, a_float, "a message"
         assert_nothing_raised { foo = 1 }
         assert_nothing_raised do
-          foo = 2
+          bar = 2
         end
-        assert_nothing_thrown { foo = 3 }
+        [2].each do |a|
+          assert_equal 2, a
+        end
+        [0,1,2].each_with_index do |b, c|
+          assert_equal c, b
+        end
+        assert_nothing_thrown { zip = 3 }
         assert_nothing_thrown do
-          foo = 4
+          zap = 4
         end
         #assert_operator       object1, operator, object2, "a message"
         assert_raise(NotImplementedError){ raise NotImplementedError }
@@ -54,8 +61,8 @@ module Spec
         assert_throws(:foo, "a message") do
           throw :foo
         end
-
       end
+
     end
   end
 end

data/test/spec/tool/test_unit_translator_test.rb

@@ -1,5 +1,7 @@
 require File.dirname(__FILE__) + '/../../test_helper'
+require 'rubygems'
 require 'spec/tool/test_unit_translator'
+require 'spec/tool/test_unit_api_test'
 require 'tempfile'
 
 module Spec
@@ -8,7 +10,9 @@ module Spec
       def test_should_translate_test_classes_to_contexts
         c = TestUnitTranslator.new
         test_unit_file = File.dirname(__FILE__) + '/test_unit_api_test.rb'
-        translated = c.translate(test_unit_file)
+        translated = c.translate(Spec::Tool::TestUnitApiTest)
+#puts translated
+#exit!1
         expected_path = File.dirname(__FILE__) + '/test_unit_api_spec.rb'
         expected = File.open(expected_path).read
 
@@ -24,6 +28,7 @@ module Spec
           assert true # Just so we get an assertion count in the output
         end
       end
+      
     end
   end
 end

metadata

@@ -3,9 +3,9 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 0.5.7
-date: 2006-06-07 00:00:00 -05:00
-summary: RSpec-0.5.7 - BDD for Ruby http://rspec.rubyforge.org/
+  version: 0.5.8
+date: 2006-06-09 00:00:00 -05:00
+summary: RSpec-0.5.8 - BDD for Ruby http://rspec.rubyforge.org/
 require_paths: 
 - lib
 email: rspec-devel@rubyforge.org
@@ -29,6 +29,7 @@ authors:
 - Steven Baker, Aslak Hellesoy, Dave Astels, David Chelimsky
 files: 
 - CHANGES
+- EXAMPLES.rd
 - Rakefile
 - README
 - lib/spec.rb
@@ -69,8 +70,9 @@ files:
 - lib/spec/runner/spec_matcher.rb
 - lib/spec/runner/specdoc_formatter.rb
 - lib/spec/runner/specification.rb
-- lib/spec/tool/command_line.rb
+- lib/spec/tool/ruby2ruby.rb
 - lib/spec/tool/test_unit_translator.rb
+- lib/spec/tool/translation_test_runner.rb
 - test/test_helper.rb
 - test/spec/api/duck_type_test.rb
 - test/spec/api/sugar_test.rb
@@ -103,7 +105,7 @@ files:
 - test/spec/runner/spec_matcher_test.rb
 - test/spec/runner/specdoc_formatter_test.rb
 - test/spec/runner/specification_test.rb
-- test/spec/tool/command_line_test.rb
+- test/spec/tool/ruby_to_ruby_test.rb
 - test/spec/tool/test_unit_api_spec.rb
 - test/spec/tool/test_unit_api_test.rb
 - test/spec/tool/test_unit_translator_test.rb
@@ -144,7 +146,7 @@ files:
 - doc/src/tools/rake.page
 - doc/src/tools/rcov.page
 - doc/src/tools/spec.page
-- doc/src/tools/test2rspec.page
+- doc/src/tools/test2spec.page
 - doc/src/tutorials/index.page
 - doc/src/tutorials/meta.info
 - doc/src/tutorials/notes.txt
@@ -159,22 +161,21 @@ files:
 - doc/src/tutorials/stack_06.page
 - doc/src/tutorials/stack_06.page.orig
 - doc/src/tutorials/stack_spec.rb
-- EXAMPLES.rd
 test_files: []
 
 rdoc_options: 
 - --title
 - RSpec
+- --line-numbers
+- --inline-source
 - --main
 - README
-- --line-numbers
 extra_rdoc_files: 
 - README
 - CHANGES
-- EXAMPLES.rd
 executables: 
 - spec
-- test2rspec
+- test2spec
 extensions: []
 
 requirements: []

data/bin/test2rspec

@@ -1,35 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'find'
-require 'ostruct'
-require 'optparse'
-require File.dirname(__FILE__) + "/../lib/spec/tool/command_line.rb"
-require File.dirname(__FILE__) + "/../lib/spec/tool/test_unit_translator.rb"
-
-opts = OptionParser.new do |opts|
-  opts.banner = "Usage: test2rspec [options] SRC [DEST]"
-  opts.separator ""
-
-  opts.on_tail("-h", "--help", "Show this message") do
-    puts opts
-    exit
-  end
-end
-opts.parse!(ARGV)
-
-cl = Spec::Tool::CommandLine.new
-source = ARGV[0]
-target = ARGV[1]
-
-if source.nil?
-  STDERR.puts opts
-  exit 1
-end
-
-begin
-  cl.run source, target, STDOUT
-rescue => e
-  STDERR.puts e.message
-  STDERR.puts e.backtrace.join("\n")
-  STDERR.puts opts
-end

data/doc/src/tools/test2rspec.page

@@ -1,13 +0,0 @@
----
-title: Test::Unit Migration
-inMenu: true
----
-h2. Test::Unit migration
-
-rSpec provides a tool for translating existing Test::Unit files into specifications.  Anything that cannot be converted is left in its original form.  The command line is:
-
-<pre>
-test2rspec SRC [DEST]
-</pre>
-
-If DEST is not supplied, output is sent to STDOUT. SRC and DEST can be a file or a directory.  If SRC is a directory, every test file under it will be translated.