wrong 0.6.3-java → 0.7.0-java

data/test/failure_message_test.rb

@@ -1,5 +1,6 @@
 require "./test/test_helper"
 require "wrong/assert"
+require "wrong/chunk"
 require "wrong/failure_message"
 
 class BogusFormatter < Wrong::FailureMessage::Formatter
@@ -15,6 +16,11 @@ end
 class BogusPredicate < Predicated::Predicate
 end
 
+# normalize yaml
+def y(s)
+  s.gsub(/--- $/, "---").chomp
+end
+
 module Wrong
 
   describe Wrong::FailureMessage::Formatter do
@@ -27,13 +33,13 @@ module Wrong
     end
   end
 
-  describe Wrong::FailureMessage do    
+  describe Wrong::FailureMessage do
     include Wrong::Assert
 
     it "can register a formatter class for a predicate pattern" do
       Wrong::FailureMessage.register_formatter(::BogusFormatter)
       assert { Wrong::FailureMessage.formatter_for(::BogusPredicate.new).is_a? ::BogusFormatter }
-      assert { Wrong::FailureMessage.formatters.include?(::BogusFormatter)}
+      assert { Wrong::FailureMessage.formatters.include?(::BogusFormatter) }
     end
 
     before do
@@ -43,22 +49,21 @@ module Wrong
     end
 
     def message(options = {}, &block)
-      valence = options[:valence] || :assert 
+      valence = options[:valence] || :assert
       explanation = options[:explanation]
       Wrong::FailureMessage.new(@chunk, valence, explanation)
     end
 
-
-    describe "#basic" do      
+    describe "#basic" do
       it "shows the code" do
         assert { message.basic == "Expected ((2 + 2) == 5)" }
       end
-      
+
       it "reverses the message for :deny valence" do
         assert { message(:valence => :deny).basic == "Didn't expect ((2 + 2) == 5)" }
       end
     end
-    
+
     describe '#full' do
       it "contains the basic message" do
         assert { message.full.include? message.basic }
@@ -68,23 +73,217 @@ module Wrong
         msg = message(:explanation => "the sky is falling")
         assert { msg.full.include? "the sky is falling" }
       end
-      
+
       it "doesn't say 'but' if there are no details" do
         @chunk = Wrong::Chunk.new(__FILE__, __LINE__ + 1) do
           2
         end
-        assert { @chunk.details.empty? }
-        deny { message.full.include? ", but"}
+        assert { message.details.empty? }
+        deny { message.full.include? ", but" }
       end
-      
+
       it "says 'but' if there are details" do
         @chunk = Wrong::Chunk.new(__FILE__, __LINE__ + 1) do
           2 + 2 == 5
         end
-        assert { message.full.include? ", but\n    (2 + 2) is 4"}
+        assert { message.full.include? ", but\n    (2 + 2) is 4" }
       end
-            
     end
 
+    describe "#details" do
+      def details(&block)
+        @chunk = Wrong::Chunk.from_block(block, 1)
+        message.details
+      end
+
+      it "returns an empty string if there are no parts" do
+        d = details { assert { true } }
+        assert d == ""
+      end
+
+      it "returns an string beginning with a newline if there are parts" do
+        x = 10
+        d = details { assert { x == 10 } }
+        assert d == "\n    x is 10\n"
+      end
+
+      it "skips literals" do
+        d = details { assert { 10 == 11 } }
+        assert d == ""
+      end
+
+      it "shows lots of details" do
+        x = 10
+        d = details { assert { (x * (x - 10)) == (x / (x + 10)) } }
+        assert d == <<-DETAILS
+
+    (x * (x - 10)) is 0
+    x is 10
+    (x - 10) is 0
+    (x / (x + 10)) is 0
+    (x + 10) is 20
+        DETAILS
+      end
+
+      it "skips duplicates" do
+        x = 10
+        d = details { assert { (x + 5) == 1 + (x + 5) } }
+        assert d == <<-DETAILS
+
+    (x + 5) is 15
+    x is 10
+    (1 + (x + 5)) is 16
+        DETAILS
+      end
+
+      it "shows exceptions" do
+        d = details { assert { (raise "hi") == 1 } }
+        assert d == "\n    raise(\"hi\") raises RuntimeError: hi\n"
+      end
+
+      it "indents newlines inside the exception message" do
+        d = details { assert { (raise "hello\nsailor") == 1 } }
+        assert d == "\n    raise(\"hello\\nsailor\") raises RuntimeError: hello\n      sailor\n"
+      end
+
+      it "abridges exceptions with no message" do
+        d = details { assert { (raise Exception.new) == 1 } }
+        assert d == "\n    raise(Exception.new) raises Exception\n" +
+            "    Exception.new is #<Exception: Exception>\n"
+      end
+
+      it "inspects values" do
+        x = "flavor:\tvanilla"
+        d = details { assert { x == "flavor:\tchocolate" } }
+        # this means it's a literal slash plus t inside double quotes -- i.e. it shows the escaped (inspected) string
+        assert d == "\n" + '    x is "flavor:\tvanilla"' + "\n"
+      end
+
+      it "splits lower-down details correctly (bug)" do
+        hash = {:flavor => "vanilla"}
+        exception_with_newlines = Exception.new(hash.to_yaml.chomp)
+        d = details {
+          rescuing { raise exception_with_newlines }.message.include?(":flavor: chocolate")
+        }
+        assert (y(d).include? "exception_with_newlines is #<Exception: ---\n      :flavor: vanilla>"), d.inspect
+      end
+
+      it "skips assignments" do
+        y = 14
+        d = details do
+          x = 7; y
+        end
+        assert d !~ /x = 7/
+        assert d =~ /y is 14/
+      end
+
+      class Weirdo
+        def initialize(inspected_value)
+          @inspected_value = inspected_value
+        end
+
+        def inspect
+          @inspected_value
+        end
+      end
+
+      it "indents unescaped newlines inside the inspected value" do
+        x = Weirdo.new("first\nsecond\nthird")
+        d = details { assert { x == "foo" } }
+        assert d == "\n    x is first\n      second\n      third\n"
+      end
+
+      describe '#pretty_value' do
+        before do
+          @chunk = chunk = Chunk.new(__FILE__, __LINE__ + 1); <<-CODE
+          true
+          CODE
+        end
+
+        after do
+          Wrong::Terminal.width = 80
+        end
+
+        it 'inspects its value' do
+          assert message.pretty_value(12) == "12"
+          assert message.pretty_value("foo") == "\"foo\""
+        end
+
+        it 'escapes newlines in strings' do
+          assert message.pretty_value("foo\nbar\nbaz") == "\"foo\\nbar\\nbaz\""
+        end
+
+        it 'indents newlines in raw inspect values (e.g. exceptions or YAML or whatever)' do
+          w = Weirdo.new("foo\nbar\nbaz")
+          assert message.pretty_value(w) == "foo\n      bar\n      baz"
+        end
+
+        it "returns the terminal width" do
+          assert Terminal.width.is_a? Fixnum
+          assert Terminal.width > 0
+        end
+
+        it "can fake the terminal width" do
+          Terminal.width = 66
+          assert Terminal.width == 66
+        end
+
+        # def pretty_value(value, starting_col = 0, indent_wrapped_lines = 3, size = Terminal.size)
+
+        it 'inserts newlines in really long values, wrapped at the given width' do
+          abc = Weirdo.new("abcdefghijklmnopqrstuvwxyz")
+          pretty = message.pretty_value(abc, 0, 0, 10)
+          assert pretty == <<-DONE.chomp
+abcdefghij
+klmnopqrst
+uvwxyz
+          DONE
+        end
+
+        it 'inserts newlines in really long values, wrapped at the terminal width' do
+          Terminal.width = 10
+          abc = Weirdo.new("abcdefghijklmnopqrstuvwxyz")
+          pretty = message.pretty_value(abc, 0, 0)
+          assert pretty == <<-DONE.chomp
+abcdefghij
+klmnopqrst
+uvwxyz
+          DONE
+        end
+
+        it 'subtracts the starting column from the wrapped width of the first line' do
+          abc = Weirdo.new("abcdefghijklmnopqrstuvwxyz")
+          pretty = message.pretty_value(abc, 2, 0, 10)
+          assert pretty == <<-DONE.chomp
+abcdefgh
+ijklmnopqr
+stuvwxyz
+          DONE
+        end
+
+        it "indents wrapped lines" do
+          abc = Weirdo.new("abcdefghijklmnopqrstuvwxyz")
+          pretty = message.pretty_value(abc, 2, 3, 10)
+          assert pretty == <<-DONE.chomp
+abcdefgh
+   ijklmno
+   pqrstuv
+   wxyz
+          DONE
+        end
+
+        it "wraps correctly" do
+          hash = {:flavor => "vanilla"}
+          object = Weirdo.new(hash.to_yaml.chomp)
+          pretty = message.pretty_value(object, 2, 3, 80)
+          assert y(pretty) == y(<<-DONE), pretty.inspect
+---
+      :flavor: vanilla
+          DONE
+        end
+
+
+      end
+    end
   end
 end

data/test/test_helper.rb

@@ -37,8 +37,8 @@ def sys(cmd, expected_status = 0)
     # in Ruby 1.8, wait_thread is nil :-( so just pretend the process was successful (status 0)
     exit_status = (wait_thread.value.exitstatus if wait_thread) || 0
     output = stdout.read + stderr.read
-    unless expected_status.nil?
-      assert(cmd) { output and exit_status == expected_status }
+    unless expected_status == :ignore
+      assert(cmd) { cmd and output and exit_status == expected_status }
     end
     yield output if block_given?
     output

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wrong
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
   prerelease: 
 platform: java
 authors:
@@ -10,24 +10,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2012-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicated
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
@@ -131,12 +131,30 @@ files:
 - lib/wrong/message/test_context.rb
 - lib/wrong/rainbow.rb
 - lib/wrong/rescuing.rb
-- lib/wrong/ruby2ruby_patch.rb
 - lib/wrong/sexp_ext.rb
+- lib/wrong/terminal.rb
 - lib/wrong/version.rb
 - lib/wrong.rb
 - README.markdown
 - test/adapters/minitest_test.rb
+- test/adapters/railsapp/app/controllers/application_controller.rb
+- test/adapters/railsapp/app/helpers/application_helper.rb
+- test/adapters/railsapp/config/application.rb
+- test/adapters/railsapp/config/boot.rb
+- test/adapters/railsapp/config/environment.rb
+- test/adapters/railsapp/config/environments/development.rb
+- test/adapters/railsapp/config/environments/production.rb
+- test/adapters/railsapp/config/environments/test.rb
+- test/adapters/railsapp/config/initializers/backtrace_silencers.rb
+- test/adapters/railsapp/config/initializers/inflections.rb
+- test/adapters/railsapp/config/initializers/mime_types.rb
+- test/adapters/railsapp/config/initializers/secret_token.rb
+- test/adapters/railsapp/config/initializers/session_store.rb
+- test/adapters/railsapp/config/initializers/wrap_parameters.rb
+- test/adapters/railsapp/config/routes.rb
+- test/adapters/railsapp/db/seeds.rb
+- test/adapters/railsapp/spec/spec_helper.rb
+- test/adapters/railsapp/spec/wrong_spec.rb
 - test/adapters/rspec1/failing_spec.rb
 - test/adapters/rspec2/failing_spec.rb
 - test/adapters/rspec_rails_test.rb
@@ -176,13 +194,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2653256029812860538
+      hash: -3959887704133047026
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3959887704133047026
 requirements: []
 rubyforge_project: wrong
 rubygems_version: 1.8.24
@@ -192,6 +213,24 @@ summary: Wrong provides a general assert method that takes a predicate block.  A
   failure messages are rich in detail.
 test_files:
 - test/adapters/minitest_test.rb
+- test/adapters/railsapp/app/controllers/application_controller.rb
+- test/adapters/railsapp/app/helpers/application_helper.rb
+- test/adapters/railsapp/config/application.rb
+- test/adapters/railsapp/config/boot.rb
+- test/adapters/railsapp/config/environment.rb
+- test/adapters/railsapp/config/environments/development.rb
+- test/adapters/railsapp/config/environments/production.rb
+- test/adapters/railsapp/config/environments/test.rb
+- test/adapters/railsapp/config/initializers/backtrace_silencers.rb
+- test/adapters/railsapp/config/initializers/inflections.rb
+- test/adapters/railsapp/config/initializers/mime_types.rb
+- test/adapters/railsapp/config/initializers/secret_token.rb
+- test/adapters/railsapp/config/initializers/session_store.rb
+- test/adapters/railsapp/config/initializers/wrap_parameters.rb
+- test/adapters/railsapp/config/routes.rb
+- test/adapters/railsapp/db/seeds.rb
+- test/adapters/railsapp/spec/spec_helper.rb
+- test/adapters/railsapp/spec/wrong_spec.rb
 - test/adapters/rspec1/failing_spec.rb
 - test/adapters/rspec2/failing_spec.rb
 - test/adapters/rspec_rails_test.rb

data/lib/wrong/ruby2ruby_patch.rb

@@ -1,37 +0,0 @@
-class ::Ruby2Ruby < ::SexpProcessor
-  # see http://gist.github.com/321038
-  # Monkey-patch to have Ruby2Ruby#translate with r2r >= 1.2.3, from
-  # http://seattlerb.rubyforge.org/svn/ruby2ruby/1.2.2/lib/ruby2ruby.rb
-  def self.translate(klass_or_str, method = nil)
-    sexp = ParseTree.translate(klass_or_str, method)
-    unifier = Unifier.new
-    unifier.processors.each do |p|
-      p.unsupported.delete :cfunc # HACK
-    end
-    sexp = unifier.process(sexp)
-    self.new.process(sexp)
-  end
-
-  #sconover - 7/2010 - monkey-patch
-  #{1=>2}=={1=>2}
-  #The right side was having its braces cut off because of
-  #special handling of hashes within arglists within the seattlerb code.
-  #I tried to fork r2r and add a test, but a lot of other tests
-  #broke, and I just dont understand the test in ruby2ruby.
-  #So I'm emailing the author...
-  def process_hash(exp)
-    result = []
-    until exp.empty?
-      lhs = process(exp.shift)
-      rhs = exp.shift
-      t = rhs.first
-      rhs = process rhs
-      rhs = "(#{rhs})" unless [:lit, :str].include? t # TODO: verify better!
-
-      result << "#{lhs} => #{rhs}"
-    end
-
-    return "{ #{result.join(', ')} }"
-  end
-
-end