minitest-great_expectations 0.0.3 → 0.0.4

data/README.md

@@ -5,6 +5,7 @@ having, especially if you're coming from rspec:
 
 ``` ruby
 [1, 2, 3].must_equal_contents [3, 2, 1]
+{:a => 1, :b => 2}.must_equal_hash {:b => 2, :a => 1}
 [1, 2, 3].must_include_all [1, 2]
 something.works?.should_be_true
 ```
@@ -39,6 +40,11 @@ And then execute:
 
 ## Changelog
 
+### 0.0.4
+
+* Added ```assert_equal_hash```/```must_equal_hash```
+* Reordered error messages to be more consistent with must_equal/assert_equal
+
 ### 0.0.3
 
 * Added ```assert_includes_none```/```wont_include_any```

data/lib/minitest/great_expectations.rb

@@ -18,7 +18,34 @@ module MiniTest::Assertions
       error_msgs << "Extraneous actual elements:\n  #{mu_pp missing_from_expected}"
     end
     unless error_msgs.empty?
-      message ||= "Expected:\n  #{mu_pp actual}\nto equal contents of:\n  #{mu_pp expected}."
+      message ||= "Expected:\n  #{mu_pp expected}\nDid not match contents of Actual:\n  #{mu_pp actual}."
+      flunk("#{message}\n#{error_msgs.join("\n")}")
+    end
+  end
+
+  # Hash keys and values must be the same
+  def assert_equal_hash(expected, actual, message = nil)
+    e_keys = expected.keys
+    a_keys = actual.keys
+    error_msgs = []
+    missing_from_actual = e_keys - a_keys
+    unless missing_from_actual.empty?
+      error_msgs << "Missing expected keys:\n #{mu_pp missing_from_actual}"
+    end
+    missing_from_expected = a_keys - e_keys
+    unless missing_from_expected.empty?
+      error_msgs << "Extraneous actual keys:\n  #{mu_pp missing_from_expected}"
+    end
+    intersecting_keys = e_keys & a_keys
+    intersecting_keys.each do |ea|
+      exp = expected[ea]
+      act = actual[ea]
+      unless exp == act
+        error_msgs << "Expected [#{mu_pp ea}]: #{mu_pp exp}\nActual [#{mu_pp ea}]: #{mu_pp act}"
+      end
+    end
+    unless error_msgs.empty?
+      message ||= "Expected:\n  #{mu_pp expected}\ndid not equal Actual:\n  #{mu_pp actual}."
       flunk("#{message}\n#{error_msgs.join("\n")}")
     end
   end
@@ -27,7 +54,7 @@ module MiniTest::Assertions
   def assert_includes_all(expected, actual, message = nil)
     missing_from_expected = expected.to_a - actual.to_a
     unless missing_from_expected.empty?
-      message ||= "Expected:\n  #{mu_pp actual}\nto contain every element in:\n  #{mu_pp expected}."
+      message ||= "Expected:\n  #{mu_pp expected}\ndid not contain every element in Actual:\n  #{mu_pp actual}."
       flunk("#{message}\nMissing expected elements:\n  #{mu_pp missing_from_expected}")
     end
   end
@@ -35,7 +62,7 @@ module MiniTest::Assertions
   def assert_includes_none(expected, actual, message = nil)
     unexpected = expected.to_a & actual.to_a
     unless unexpected.empty?
-      message ||= "Expected:\n  #{mu_pp actual}\nnot to contain any element in:\n  #{mu_pp expected}."
+      message ||= "Expected:\n  #{mu_pp expected}\ncontained elements in Actual:\n  #{mu_pp actual}."
       flunk("#{message}\nUnexpected elements:\n  #{mu_pp unexpected.sort}")
     end
   end
@@ -65,6 +92,7 @@ end
 
 module MiniTest::Expectations
   infect_an_assertion :assert_equal_contents, :must_equal_contents
+  infect_an_assertion :assert_equal_hash, :must_equal_hash
   infect_an_assertion :assert_includes_all, :must_include_all
   infect_an_assertion :assert_includes_none, :wont_include_any
   infect_an_assertion :assert_true, :must_be_true, :unary

data/lib/minitest/great_expectations/version.rb

@@ -1,5 +1,5 @@
 module Minitest
   module GreatExpectations
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/test/great_expectations_test.rb

@@ -46,6 +46,30 @@ describe "must_equal_contents" do
   end
 end
 
+describe "assert_equal_hash" do
+  it "passes for empty" do
+    assert_equal_hash({}, {})
+  end
+  it "passes for hash" do
+    assert_equal_hash({:a => 1, :b => 2}, {:b => 2, :a => 1})
+  end
+  it "complains about missing values" do
+    l = lambda { assert_equal_hash({:a => 1, :b => 2}, {:b => 2}) }
+    error = assert_raises(MiniTest::Assertion, &l)
+    error.message.must_match /Missing expected keys:.*\[:a\]/im
+  end
+  it "complains about extra values" do
+    l = lambda { assert_equal_hash({:a => 1}, {:a => 1, :b => 2}) }
+    error = assert_raises(MiniTest::Assertion, &l)
+    error.message.must_match /Extraneous actual keys.*\[:b\]/im
+  end
+  it "complains about different values for the same key" do
+    l = lambda { assert_equal_hash({:a => 1}, {:a => 2}) }
+    error = assert_raises(MiniTest::Assertion, &l)
+    error.message.must_match /Expected \[:a\]:.*1.Actual \[:a\]:.*2/im
+  end
+end
+
 describe "assert_includes_all" do
   it "passes on empty expected" do
     assert_includes_all([], [])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-great_expectations
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-05 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -92,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -246921461347167831
+      hash: 285768661627063719
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -246921461347167831
+      hash: 285768661627063719
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23