From af92a66e4062ad490a7a5efd8b3a7084b12997a5 Mon Sep 17 00:00:00 2001
From: Brandon Keepers <brandon@collectiveidea.com>
Date: Sun, 3 Aug 2008 16:33:41 -0400
Subject: [PATCH] fix warnings when running tests

---
 .gitignore                                             | 1 +
 test/test_helper.rb                                    | 1 -
 test/unit/graticule/distance_test.rb                   | 2 +-
 test/unit/graticule/geocoder/geocoder_us_test.rb       | 2 +-
 test/unit/graticule/geocoder/geocoders.rb              | 2 +-
 test/unit/graticule/geocoder/google_test.rb            | 2 +-
 test/unit/graticule/geocoder/host_ip_test.rb           | 2 +-
 test/unit/graticule/geocoder/local_search_maps_test.rb | 2 +-
 test/unit/graticule/geocoder/meta_carta_test.rb        | 2 +-
 test/unit/graticule/geocoder/multi_test.rb             | 4 ++--
 test/unit/graticule/geocoder/postcode_anywhere_test.rb | 2 +-
 test/unit/graticule/geocoder/yahoo_test.rb             | 2 +-
 test/unit/graticule/geocoder_test.rb                   | 2 +-
 test/unit/graticule/location_test.rb                   | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..dbddb54
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+test/config.yml
\ No newline at end of file
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 9e99805..7c9dc3b 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -4,7 +4,6 @@
 require 'rubygems'
 require 'yaml'
 require 'test/unit'
-require 'breakpoint'
 require 'graticule'
 require 'mocha'
 
diff --git a/test/unit/graticule/distance_test.rb b/test/unit/graticule/distance_test.rb
index 899b4dc..e9d014f 100644
--- a/test/unit/graticule/distance_test.rb
+++ b/test/unit/graticule/distance_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
 
 module Graticule
   module Distance
diff --git a/test/unit/graticule/geocoder/geocoder_us_test.rb b/test/unit/graticule/geocoder/geocoder_us_test.rb
index e778656..49a3f83 100644
--- a/test/unit/graticule/geocoder/geocoder_us_test.rb
+++ b/test/unit/graticule/geocoder/geocoder_us_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
 
 module Graticule
   module Geocoder
diff --git a/test/unit/graticule/geocoder/geocoders.rb b/test/unit/graticule/geocoder/geocoders.rb
index 8f64143..87dcaed 100644
--- a/test/unit/graticule/geocoder/geocoders.rb
+++ b/test/unit/graticule/geocoder/geocoders.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
 
 
 module Graticule
diff --git a/test/unit/graticule/geocoder/google_test.rb b/test/unit/graticule/geocoder/google_test.rb
index d93ef72..feeefc1 100644
--- a/test/unit/graticule/geocoder/google_test.rb
+++ b/test/unit/graticule/geocoder/google_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
 
 module Graticule
   module Geocoder
diff --git a/test/unit/graticule/geocoder/host_ip_test.rb b/test/unit/graticule/geocoder/host_ip_test.rb
index 6bb033d..2bb5f9a 100644
--- a/test/unit/graticule/geocoder/host_ip_test.rb
+++ b/test/unit/graticule/geocoder/host_ip_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
 
 module Graticule
   module Geocoder
diff --git a/test/unit/graticule/geocoder/local_search_maps_test.rb b/test/unit/graticule/geocoder/local_search_maps_test.rb
index 40b1162..3325c65 100644
--- a/test/unit/graticule/geocoder/local_search_maps_test.rb
+++ b/test/unit/graticule/geocoder/local_search_maps_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
 
 module Graticule
   module Geocoder
diff --git a/test/unit/graticule/geocoder/meta_carta_test.rb b/test/unit/graticule/geocoder/meta_carta_test.rb
index 3778ce6..b5da1ff 100644
--- a/test/unit/graticule/geocoder/meta_carta_test.rb
+++ b/test/unit/graticule/geocoder/meta_carta_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
 
 module Graticule
   module Geocoder
diff --git a/test/unit/graticule/geocoder/multi_test.rb b/test/unit/graticule/geocoder/multi_test.rb
index a51030b..bf3f929 100644
--- a/test/unit/graticule/geocoder/multi_test.rb
+++ b/test/unit/graticule/geocoder/multi_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
 
 module Graticule
   module Geocoder
@@ -7,7 +7,7 @@ class MultiTest < Test::Unit::TestCase
       def setup
         @mock_geocoders = [mock("geocoder 1"), mock("geocoder 2")]
         @mock_geocoders.each {|g| g.stubs(:locate) }
-        @geocoder = Multi.new *@mock_geocoders
+        @geocoder = Multi.new(*@mock_geocoders)
       end
 
       def test_locate_calls_each_geocoder_and_raises_error
diff --git a/test/unit/graticule/geocoder/postcode_anywhere_test.rb b/test/unit/graticule/geocoder/postcode_anywhere_test.rb
index 12ac8e3..2ccde52 100644
--- a/test/unit/graticule/geocoder/postcode_anywhere_test.rb
+++ b/test/unit/graticule/geocoder/postcode_anywhere_test.rb
@@ -1,6 +1,6 @@
 # account code: INDIV30777
 # license key: KG39-HM17-PZ95-NR98
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
 
 module Graticule
   module Geocoder
diff --git a/test/unit/graticule/geocoder/yahoo_test.rb b/test/unit/graticule/geocoder/yahoo_test.rb
index 03189ef..184a7eb 100644
--- a/test/unit/graticule/geocoder/yahoo_test.rb
+++ b/test/unit/graticule/geocoder/yahoo_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
 
 module Graticule
   module Geocoder
diff --git a/test/unit/graticule/geocoder_test.rb b/test/unit/graticule/geocoder_test.rb
index 5aa8f80..12f5d78 100644
--- a/test/unit/graticule/geocoder_test.rb
+++ b/test/unit/graticule/geocoder_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
 
 module Graticule
   class GeocoderTest < Test::Unit::TestCase
diff --git a/test/unit/graticule/location_test.rb b/test/unit/graticule/location_test.rb
index 7f4944b..164c2b8 100644
--- a/test/unit/graticule/location_test.rb
+++ b/test/unit/graticule/location_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
 
 module Graticule
   class LocationTest < Test::Unit::TestCase