Made the tests pass; minor cleanup

Author: rmm5t

test/test_address_extractor.rb

@@ -1,21 +1,16 @@
-$: << File.dirname(__FILE__)+"/../lib"
-
-require 'test/unit'
-require 'address_extractor.rb'
-require 'test_helper.rb'
+require 'address_extractor'
+require 'test_helper'
 include TestDataHelper
 
 class AddressExtractorTest < Test::Unit::TestCase
-  include Helpers
-
   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
     end
   end
-  
+
   def test_find_addresses
     each_test_data do |test_data|
       addresses = AddressExtractor.find_addresses(test_data[:input])
@@ -25,11 +20,11 @@ def test_find_addresses
       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_match /^\s*123 Foo St., Someplace FL\s*/, address 
+      assert_match /^\s*123 Foo St., Someplace FL\s*/, address
       "skidoosh"
     end
     assert string =~ /Please send the package to skidoosh/
@@ -70,7 +65,7 @@ def test_no_addresses_found
 
 test_input "Let's meet tomorrow at noon at 123 Foo Bar Street, Scooby, NY 12345",
   { :street1 => "123 Foo Bar Street", :street2 => nil, :city => "Scooby", :state => "NY", :zip => "12345" }
-  
+
 test_input "Let's meet tomorrow at noon at 123 Foo Bar Street, Scooby, NY, 12345",
   { :street1 => "123 Foo Bar Street", :street2 => nil, :city => "Scooby", :state => "NY", :zip => "12345" }
 
@@ -85,4 +80,4 @@ def test_no_addresses_found
 
 test_input "Apple Computer, Inc. 1 Infinite Loop, Cupertino, CA 95014",
   { :street1 => "1 Infinite Loop", :street2 => nil, :city => "Cupertino", :state => "CA", :zip => "95014" }
-  
+

test/test_helper.rb

@@ -1,27 +1,27 @@
-module TestDataHelper
-
-  TEST_DATA = []
+require 'test/unit'
 
+module TestDataHelper
   def test_input(input_string, *expected_outputs)
     test_data << { :input => input_string, :expected_output => expected_outputs }
   end
 
   def each_test_data
     test_data.each { |t| yield(t) }
   end
-  
+
   def test_data
-    TEST_DATA
+    @@test_data ||= []
   end
-  
 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}"
     end
   end
-  
+end
+
+class Test::Unit::TestCase
+  include Helpers
 end