Prepare for Rails 2.1+, as we will no longer be able to use a symbol in the set_fixtu...

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 713bbf6484af8220e3b55f12d2fa19855b34cb64..a170aed4fba9f08be9372da51e18a778382af3e7 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -27,35 +27,36 @@ class Test::Unit::TestCase
 
   # Load standard fixtures needed to test API methods
   def self.api_fixtures
 
   # Load standard fixtures needed to test API methods
   def self.api_fixtures

+    print "setting up the api_fixtures"

     fixtures :users, :changesets
 
     fixtures :current_nodes, :nodes
     fixtures :users, :changesets
 
     fixtures :current_nodes, :nodes

-    set_fixture_class :current_nodes => :Node
-    set_fixture_class :nodes => :OldNode
+    set_fixture_class :current_nodes => Node
+    set_fixture_class :nodes => OldNode

 
     fixtures  :current_node_tags,:node_tags
 
     fixtures  :current_node_tags,:node_tags

-    set_fixture_class :current_node_tags => :NodeTag
-    set_fixture_class :node_tags => :OldNodeTag
+    set_fixture_class :current_node_tags => NodeTag
+    set_fixture_class :node_tags => OldNodeTag

 
     fixtures :current_ways, :current_way_nodes, :current_way_tags
 
     fixtures :current_ways, :current_way_nodes, :current_way_tags

-    set_fixture_class :current_ways => :Way
-    set_fixture_class :current_way_nodes => :WayNode
-    set_fixture_class :current_way_tags => :WayTag
+    set_fixture_class :current_ways => Way
+    set_fixture_class :current_way_nodes => WayNode
+    set_fixture_class :current_way_tags => WayTag

 
     fixtures :ways, :way_nodes, :way_tags
 
     fixtures :ways, :way_nodes, :way_tags

-    set_fixture_class :ways => :OldWay
-    set_fixture_class :way_nodes => :OldWayNode
-    set_fixture_class :way_tags => :OldWayTag
+    set_fixture_class :ways => OldWay
+    set_fixture_class :way_nodes => OldWayNode
+    set_fixture_class :way_tags => OldWayTag

 
     fixtures :current_relations, :current_relation_members, :current_relation_tags
 
     fixtures :current_relations, :current_relation_members, :current_relation_tags

-    set_fixture_class :current_relations => :Relation
-    set_fixture_class :current_relation_members => :RelationMember
-    set_fixture_class :current_relation_tags => :RelationTag
+    set_fixture_class :current_relations => Relation
+    set_fixture_class :current_relation_members => RelationMember
+    set_fixture_class :current_relation_tags => RelationTag

 
     fixtures :relations, :relation_members, :relation_tags
 
     fixtures :relations, :relation_members, :relation_tags

-    set_fixture_class :relations => :OldRelation
-    set_fixture_class :relation_members => :OldRelationMember
-    set_fixture_class :relation_tags => :OldRelationTag
+    set_fixture_class :relations => OldRelation
+    set_fixture_class :relation_members => OldRelationMember
+    set_fixture_class :relation_tags => OldRelationTag

   end
 
   ##
   end
 
   ##

diff --git a/test/unit/current_node_tag_test.rb b/test/unit/current_node_tag_test.rb
index 98bceb4e5333c81bef9fe701d0d5095d6025e242..143fa24422de5c5b03a7d6d3b8c4e1d31d25d8fa 100644 (file)
--- a/test/unit/current_node_tag_test.rb
+++ b/test/unit/current_node_tag_test.rb
@@ -2,8 +2,8 @@ require File.dirname(__FILE__) + '/../test_helper'
 
 class CurrentNodeTagTest < Test::Unit::TestCase
   fixtures :current_node_tags, :current_nodes
 
 class CurrentNodeTagTest < Test::Unit::TestCase
   fixtures :current_node_tags, :current_nodes

-  set_fixture_class :current_nodes => :Node
-  set_fixture_class :current_node_tags => :NodeTag
+  set_fixture_class :current_nodes => Node
+  set_fixture_class :current_node_tags => NodeTag

   
   def test_tag_count
     assert_equal 6, NodeTag.count
   
   def test_tag_count
     assert_equal 6, NodeTag.count

diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb
index 7efbf9c066de537e6db24936e4d511834a1c71d7..2c6515cb7db019344d8d0a525e22f1b11f30f689 100644 (file)
--- a/test/unit/node_test.rb
+++ b/test/unit/node_test.rb
@@ -2,10 +2,10 @@ require File.dirname(__FILE__) + '/../test_helper'
 
 class NodeTest < Test::Unit::TestCase
   fixtures :changesets, :current_nodes, :users, :current_node_tags, :nodes, :node_tags
 
 class NodeTest < Test::Unit::TestCase
   fixtures :changesets, :current_nodes, :users, :current_node_tags, :nodes, :node_tags

-  set_fixture_class :current_nodes => :Node
-  set_fixture_class :nodes => :OldNode
-  set_fixture_class :node_tags => :OldNodeTag
-  set_fixture_class :current_node_tags => :NodeTag
+  set_fixture_class :current_nodes => Node
+  set_fixture_class :nodes => OldNode
+  set_fixture_class :node_tags => OldNodeTag
+  set_fixture_class :current_node_tags => NodeTag

     
   def test_node_too_far_north
          invalid_node_test(:node_too_far_north)
     
   def test_node_too_far_north
          invalid_node_test(:node_too_far_north)

diff --git a/test/unit/old_node_test.rb b/test/unit/old_node_test.rb
index 5623e9657152e837fa0103c7698757496b8cd890..bdd685388821ebf7ecdff6a3c6b45a36533da892 100644 (file)
--- a/test/unit/old_node_test.rb
+++ b/test/unit/old_node_test.rb
@@ -1,11 +1,11 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class OldNodeTest < Test::Unit::TestCase
 require File.dirname(__FILE__) + '/../test_helper'
 
 class OldNodeTest < Test::Unit::TestCase

+  set_fixture_class :current_nodes => Node
+  set_fixture_class :nodes => OldNode
+  set_fixture_class :node_tags => OldNodeTag
+  set_fixture_class :current_node_tags => NodeTag

   fixtures :current_nodes, :users, :current_node_tags, :nodes, :node_tags
   fixtures :current_nodes, :users, :current_node_tags, :nodes, :node_tags

-  set_fixture_class :current_nodes => :Node
-  set_fixture_class :nodes => :OldNode
-  set_fixture_class :node_tags => :OldNodeTag
-  set_fixture_class :current_node_tags => :NodeTag

     
   def test_node_too_far_north
          invalid_node_test(:node_too_far_north)
     
   def test_node_too_far_north
          invalid_node_test(:node_too_far_north)