expected should be the first argument on assertions

Author: rmm5t

test/test_address_extractor.rb

@@ -7,7 +7,7 @@ def test_first_address_extraction
     each_test_data do |test_data|
       address = AddressExtractor.first_address(test_data[:input])
       flunk "No address found in:\n#{test_data[:input]}" if address.nil?
-      assert_equal_hashes address, test_data[:expected_output].first
+      assert_equal_hashes test_data[:expected_output].first, address
     end
   end
 
@@ -16,14 +16,14 @@ def test_find_addresses
       addresses = AddressExtractor.find_addresses(test_data[:input])
       assert_equal addresses.size, test_data[:expected_output].size
       test_data[:expected_output].each do |expected_output|
-        assert_equal_hashes addresses.shift, expected_output
+        assert_equal_hashes expected_output, addresses.shift
       end
     end
   end
 
   def test_replace_first_address
     string = AddressExtractor.replace_first_address(test_data.first[:input]) do |address_hash, address|
-      assert_equal_hashes address_hash, test_data.first[:expected_output].first
+      assert_equal_hashes test_data.first[:expected_output].first, address_hash
       assert_match /^\s*123 Foo St., Someplace FL\s*/, address
       "skidoosh"
     end

test/test_helper.rb

@@ -17,9 +17,9 @@ def test_data
 end
 
 module Helpers
-  def assert_equal_hashes(a,b)
-    (a.keys + b.keys).uniq.each do |k|
-      assert_equal a[k], b[k], "a[#{k.inspect}] = #{a[k].inspect} != b[#{k.inspect}] = #{b[k].inspect}"
+  def assert_equal_hashes(expected, hash)
+    (expected.keys + hash.keys).uniq.each do |k|
+      assert_equal expected[k], hash[k], "expected[#{k.inspect}] = #{expected[k].inspect} != hash[#{k.inspect}] = #{hash[k].inspect}"
     end
   end
 end