wrong 0.1.0 → 0.2.0

data/test/message/array_diff_test.rb

@@ -1,37 +1,53 @@
-require "test/test_helper"
+require "./test/test_helper"
 require "wrong/assert"
 require "wrong/message/array_diff"
 require "wrong/adapters/minitest"
 
-apropos "when you're comparing strings and they don't match, show me the diff message" do
-  
-  def assert_string_diff_message(block, str)
-    assert{catch_raise{assert(&block)}.message.include?(str)}
+regarding "when you're comparing strings and they don't match, show me the diff message" do
+
+  def assert_string_diff_message(first_array, second_array, expected_error_message)
+    assert {
+      catch_raise {
+        assert { first_array == second_array }
+      }.message.include?(expected_error_message)
+    }
   end
-  
+
   test "don't attempt to do this if the assertion is not of the form a_array==b_array" do
-    deny{catch_raise{assert{[1]==2}}.message.include?("diff")}
-    deny{catch_raise{assert{nil==[1]}}.message.include?("diff")}
+    deny {
+      catch_raise {
+        assert { [1]==2 }
+      }.message.include?("diff")
+    }
+    deny {
+      catch_raise { 
+        assert { nil==[1] }
+      }.message.include?("diff")
+    }
   end
 
   test "simple" do
-    assert{catch_raise{assert{["a"]==["b"]}}.message.include?("diff")}
-    
-    assert_string_diff_message(proc{["a", "b"]==["a", "c", "c"]}, %{
+    assert {
+      catch_raise {
+        assert { ["a"]==["b"] }
+      }.message.include?("diff")
+    }
+
+    assert_string_diff_message(["a", "b"], ["a", "c", "c"], %{
 ["a", "b"]
 ["a", "c", "c"]
       ^    ^   
 })
   end
-  
+
   test "elements align properly" do
-    assert_string_diff_message(proc{["a", "b", "c"]==["a", "cccc", "c"]}, %{
+    assert_string_diff_message(["a", "b", "c"], ["a", "cccc", "c"], %{
 ["a", "b"   , "c"]
 ["a", "cccc", "c"]
       ^           
 })
 
-    assert_string_diff_message(proc{["a", "b", "c", "d"]==["a", "cccc", "xxx", "d"]}, %{
+    assert_string_diff_message(["a", "b", "c", "d"], ["a", "cccc", "xxx", "d"], %{
 ["a", "b"   , "c"  , "d"]
 ["a", "cccc", "xxx", "d"]
       ^       ^          
@@ -39,7 +55,7 @@ apropos "when you're comparing strings and they don't match, show me the diff me
   end
 
   test "different primitive types" do
-    assert_string_diff_message(proc{[1, true]==[2, true, nil]}, %{
+    assert_string_diff_message([1, true], [2, true, nil], %{
 [1, true]
 [2, true, nil]
  ^        ^   
@@ -47,13 +63,13 @@ apropos "when you're comparing strings and they don't match, show me the diff me
   end
 
   test "2d array - just inspects the inner array like it would any other element" do
-    assert{[1, [2, 3]]==[1, [2, 3]]}
-    assert_string_diff_message(proc{[1, [2]]==[1, [2, 3]]}, %{
+    assert { [1, [2, 3]] == [1, [2, 3]] }
+    assert_string_diff_message([1, [2]], [1, [2, 3]], %{
 [1, [2]   ]
 [1, [2, 3]]
     ^      
 })
 
   end
-  
-end
+
+end

data/test/message/string_diff_test.rb

@@ -1,25 +1,49 @@
-require "test/test_helper"
+require "./test/test_helper"
 require "wrong/assert"
 require "wrong/message/string_diff"
 require "wrong/adapters/minitest"
 
-apropos "when you're comparing strings and they don't match, show me the diff message" do
+regarding "when you're comparing strings and they don't match, show me the diff message" do
   
-  def assert_string_diff_message(block, str)
-    assert{catch_raise{assert(&block)}.message.include?(str)}
+  def assert_string_diff_message(first_string, second_string, str)
+    assert{
+      catch_raise{
+        assert{first_string == second_string}
+      }.message.include?(str)
+    }
   end
   
   test "don't attempt to do this if the assertion is not of the form a_string==b_string" do
-    deny{catch_raise{assert{1==2}}.message.include?("diff")}
-    deny{catch_raise{assert{"a"==2}}.message.include?("diff")}
-    deny{catch_raise{assert{1=="a"}}.message.include?("diff")}
-    deny{catch_raise{assert{nil=="a"}}.message.include?("diff")}
+    deny{
+      catch_raise{
+        assert{1==2}
+      }.message.include?("diff")
+    }
+    deny{
+      catch_raise{
+        assert{"a"==2}
+      }.message.include?("diff")
+    }
+    deny{
+      catch_raise{
+        assert{1=="a"}
+      }.message.include?("diff")
+    }
+    deny{
+      catch_raise{
+        assert{nil=="a"}
+      }.message.include?("diff")
+    }
   end
 
   test "simple" do
-    assert{catch_raise{assert{"a"=="b"}}.message.include?("diff")}
+    assert{
+      catch_raise{
+        assert{"a"=="b"}
+      }.message.include?("diff")
+    }
     
-    assert_string_diff_message(proc{"ab"=="acc"}, %{
+    assert_string_diff_message("ab", "acc",  %{
 ab
  ^ 
 acc
@@ -28,20 +52,20 @@ acc
   end
 
   test "whitespace" do
-    assert_string_diff_message(proc{"a\nb"=="a\ncc"}, %{
+    assert_string_diff_message("a\nb", "a\ncc",  %{
 a\\nb
   ^ 
 a\\ncc
   ^^
 })
 
-    assert_string_diff_message(proc{"a\tb"=="a\tcc"}, %{
+    assert_string_diff_message("a\tb", "a\tcc",  %{
 a\\tb
   ^ 
 a\\tcc
   ^^
 })
-    assert_string_diff_message(proc{"a\rb"=="a\rcc"}, %{
+    assert_string_diff_message("a\rb", "a\rcc",  %{
 a\\rb
   ^ 
 a\\rcc
@@ -54,7 +78,7 @@ a\\rcc
     left = "x"*100 + "ab" + "y"*100 + "AB" + "z"*100 
     right = "x"*100 + "acc" + "y"*100 + "ACC" + "z"*100 
     
-    assert_string_diff_message(proc{"ab"=="acc"}, %{
+    assert_string_diff_message("ab", "acc",  %{
 ...xxabyyy....yyABzzz....
       ^          ^       
 ...xxaccyyy...yyACCzzz...
@@ -62,4 +86,4 @@ a\\rcc
 })
   end
   
-end
+end

data/test/message/test_context_text.rb

@@ -1,8 +1,8 @@
-require "test/test_helper"
+require "./test/test_helper"
 require "wrong/assert"
 require "wrong/message/test_context"
 
-apropos "test failures" do
+regarding "showing the lines just above where the failure occurs, so you have some context" do
 
   include Wrong::Assert
   

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift "#{dir}/../lib"
-$LOAD_PATH.unshift "../predicated/lib"
+$LOAD_PATH.unshift "../predicated/lib" if File.exist?("../predicated/lib")
 require "rubygems"
 require "minitest/spec"
 require "minitest/unit"
@@ -13,18 +13,21 @@ def get_error
   rescue Exception, RuntimeError => e
     error = e
   end
-  e
+
+#  puts ""
+#  puts error
+#
+  error
 end
 
 class MiniTest::Unit::TestCase
-  
 end
 
 module Kernel
-  alias_method :apropos, :describe
+  alias_method :regarding, :describe
   
-  def xapropos(str)
-    puts "x'd out 'apropos \"#{str}\"'"
+  def xregarding(str)
+    puts "x'd out 'regarding \"#{str}\"'"
   end
 end
 
@@ -41,4 +44,19 @@ class MiniTest::Spec
   end
 end
 
-MiniTest::Unit.autorun
+class Color
+  attr_reader :name
+  def initialize(name)
+    @name = name
+  end
+
+  def ==(other)
+    other.is_a?(Color) && @name == other.name
+  end
+
+  def inspect
+    "Color:#{@name}"
+  end
+end
+
+MiniTest::Unit.autorun

metadata

@@ -1,43 +1,28 @@
 --- !ruby/object:Gem::Specification 
 name: wrong
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Steve Conover
+- Alex Chaffee
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-07-06 00:00:00 -07:00
+date: 2010-08-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: predicated
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 1
-        - 0
-        version: 0.1.0
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: ParseTree
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,11 +34,11 @@ dependencies:
         - 5
         version: 3.0.5
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: ruby_parser
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,11 +50,11 @@ dependencies:
         - 4
         version: 2.0.4
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: ruby2ruby
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -81,11 +66,11 @@ dependencies:
         - 4
         version: 1.2.4
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: diff
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,11 +82,11 @@ dependencies:
         - 6
         version: 0.3.6
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: diff-lcs
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -113,8 +98,13 @@ dependencies:
         - 2
         version: 1.1.2
   type: :runtime
-  version_requirements: *id006
-description: Wrong provides a general assert method that takes a predicate block.  Assertion failure messages are rich in detail.
+  version_requirements: *id005
+description: |-
+  Wrong provides a general assert method that takes a predicate block. Assertion failure
+  messages are rich in detail. The Wrong idea is to replace all those countless assert_this,
+  assert_that library methods which only exist to give a more useful failure message than
+  "assertion failed". Wrong replaces all of them in one fell swoop, since if you can write it
+  in Ruby, Wrong can make a sensible failure message out of it.
 email: sconover@gmail.com
 executables: []
 
@@ -123,9 +113,70 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
+- lib/predicated/Gemfile
+- lib/predicated/lib/predicated/autogen_call.rb
+- lib/predicated/lib/predicated/constrain.rb
+- lib/predicated/lib/predicated/evaluate.rb
+- lib/predicated/lib/predicated/from/callable_object.rb
+- lib/predicated/lib/predicated/from/json.rb
+- lib/predicated/lib/predicated/from/ruby_code_string.rb
+- lib/predicated/lib/predicated/from/url_part.rb
+- lib/predicated/lib/predicated/from/xml.rb
+- lib/predicated/lib/predicated/gem_check.rb
+- lib/predicated/lib/predicated/predicate.rb
+- lib/predicated/lib/predicated/print.rb
+- lib/predicated/lib/predicated/selectable.rb
+- lib/predicated/lib/predicated/simple_templated_predicate.rb
+- lib/predicated/lib/predicated/string_utils.rb
+- lib/predicated/lib/predicated/to/arel.rb
+- lib/predicated/lib/predicated/to/json.rb
+- lib/predicated/lib/predicated/to/sentence.rb
+- lib/predicated/lib/predicated/to/solr.rb
+- lib/predicated/lib/predicated/to/xml.rb
+- lib/predicated/lib/predicated/version.rb
+- lib/predicated/lib/predicated.rb
+- lib/predicated/LICENSE
+- lib/predicated/predicated.gemspec
+- lib/predicated/Rakefile
+- lib/predicated/README.markdown
+- lib/predicated/test/autogen_call_test.rb
+- lib/predicated/test/canonical_transform_cases.rb
+- lib/predicated/test/constrain_test.rb
+- lib/predicated/test/enumerable_test.rb
+- lib/predicated/test/equality_test.rb
+- lib/predicated/test/evaluate_test.rb
+- lib/predicated/test/from/callable_object_canonical_test.rb
+- lib/predicated/test/from/callable_object_test.rb
+- lib/predicated/test/from/json_test.rb
+- lib/predicated/test/from/ruby_code_string_canonical_test.rb
+- lib/predicated/test/from/ruby_code_string_test.rb
+- lib/predicated/test/from/url_part_parser_test.rb
+- lib/predicated/test/from/url_part_test.rb
+- lib/predicated/test/from/xml_test.rb
+- lib/predicated/test/json_conversion_test.rb
+- lib/predicated/test/print_test.rb
+- lib/predicated/test/selectable_test.rb
+- lib/predicated/test/simple_templated_predicate_test.rb
+- lib/predicated/test/suite.rb
+- lib/predicated/test/test_helper.rb
+- lib/predicated/test/test_helper_with_wrong.rb
+- lib/predicated/test/to/arel_test.rb
+- lib/predicated/test/to/json_test.rb
+- lib/predicated/test/to/sentence_test.rb
+- lib/predicated/test/to/solr_test.rb
+- lib/predicated/test/to/xml_test.rb
+- lib/predicated/test/xml_conversion_test.rb
+- lib/predicated/test_integration/arel_integration_test.rb
+- lib/predicated/test_integration/canonical_integration_cases.rb
+- lib/predicated/test_integration/schema.xml
+- lib/predicated/test_integration/solr_integration_test.rb
+- lib/predicated/test_integration/sqlite_db
+- lib/predicated/test_integration/suite.rb
+- lib/predicated/test_integration/usage_test.rb
 - lib/wrong/adapters/minitest.rb
 - lib/wrong/adapters/test_unit.rb
 - lib/wrong/assert.rb
+- lib/wrong/chunk.rb
 - lib/wrong/message/array_diff.rb
 - lib/wrong/message/string_diff.rb
 - lib/wrong/message/test_context.rb
@@ -134,8 +185,9 @@ files:
 - README.markdown
 - test/adapters/minitest_test.rb
 - test/adapters/test_unit_test.rb
-- test/basic_assert_test.rb
+- test/assert_test.rb
 - test/catch_raise_test.rb
+- test/chunk_test.rb
 - test/failures_test.rb
 - test/message/array_diff_test.rb
 - test/message/string_diff_test.rb
@@ -179,8 +231,9 @@ summary: Wrong provides a general assert method that takes a predicate block.  A
 test_files: 
 - test/adapters/minitest_test.rb
 - test/adapters/test_unit_test.rb
-- test/basic_assert_test.rb
+- test/assert_test.rb
 - test/catch_raise_test.rb
+- test/chunk_test.rb
 - test/failures_test.rb
 - test/message/array_diff_test.rb
 - test/message/string_diff_test.rb