Convert the duplicate_tags node controller test to use factories.

[rails.git] / test / models / old_way_test.rb

diff --git a/test/models/old_way_test.rb b/test/models/old_way_test.rb
index 37dfccad346f59e50617a1525b4a7c966cf615bc..84255c8807d5432f2adf84de3b0eceffe13358f1 100644 (file)
--- a/test/models/old_way_test.rb
+++ b/test/models/old_way_test.rb
@@ -38,6 +38,9 @@ class OldWayTest < ActiveSupport::TestCase
   end
 
   def test_way_tags
   end
 
   def test_way_tags

+    taglist_v3 = create_list(:old_way_tag, 3, :old_way => ways(:way_with_versions_v3))
+    taglist_v4 = create_list(:old_way_tag, 2, :old_way => ways(:way_with_versions_v4))
+

     way = ways(:way_with_versions_v1)
     tags = OldWay.find(way.id).old_tags.order(:k)
     assert_equal 0, tags.count
     way = ways(:way_with_versions_v1)
     tags = OldWay.find(way.id).old_tags.order(:k)
     assert_equal 0, tags.count


@@ -48,24 +51,25 @@ class OldWayTest < ActiveSupport::TestCase
 
     way = ways(:way_with_versions_v3)
     tags = OldWay.find(way.id).old_tags.order(:k)
 
     way = ways(:way_with_versions_v3)
     tags = OldWay.find(way.id).old_tags.order(:k)

-    assert_equal 3, tags.count
-    assert_equal "testing", tags[0].k
-    assert_equal "added in way version 3", tags[0].v
-    assert_equal "testing three", tags[1].k
-    assert_equal "added in way version 3", tags[1].v
-    assert_equal "testing two", tags[2].k
-    assert_equal "added in way version 3", tags[2].v
+    assert_equal taglist_v3.count, tags.count
+    taglist_v3.sort_by!(&:k).each_index do |i|
+      assert_equal taglist_v3[i].k, tags[i].k
+      assert_equal taglist_v3[i].v, tags[i].v
+    end

 
     way = ways(:way_with_versions_v4)
     tags = OldWay.find(way.id).old_tags.order(:k)
 
     way = ways(:way_with_versions_v4)
     tags = OldWay.find(way.id).old_tags.order(:k)

-    assert_equal 2, tags.count
-    assert_equal "testing", tags[0].k
-    assert_equal "added in way version 3", tags[0].v
-    assert_equal "testing two", tags[1].k
-    assert_equal "modified in way version 4", tags[1].v
+    assert_equal taglist_v4.count, tags.count
+    taglist_v4.sort_by!(&:k).each_index do |i|
+      assert_equal taglist_v4[i].k, tags[i].k
+      assert_equal taglist_v4[i].v, tags[i].v
+    end

   end
 
   def test_tags
   end
 
   def test_tags

+    taglist_v3 = create_list(:old_way_tag, 3, :old_way => ways(:way_with_versions_v3))
+    taglist_v4 = create_list(:old_way_tag, 2, :old_way => ways(:way_with_versions_v4))
+

     way = ways(:way_with_versions_v1)
     tags = OldWay.find(way.id).tags
     assert_equal 0, tags.size
     way = ways(:way_with_versions_v1)
     tags = OldWay.find(way.id).tags
     assert_equal 0, tags.size


@@ -76,29 +80,33 @@ class OldWayTest < ActiveSupport::TestCase
 
     way = ways(:way_with_versions_v3)
     tags = OldWay.find(way.id).tags
 
     way = ways(:way_with_versions_v3)
     tags = OldWay.find(way.id).tags

-    assert_equal 3, tags.size
-    assert_equal "added in way version 3", tags["testing"]
-    assert_equal "added in way version 3", tags["testing two"]
-    assert_equal "added in way version 3", tags["testing three"]
+    assert_equal taglist_v3.count, tags.count
+    taglist_v3.each do |tag|
+      assert_equal tag.v, tags[tag.k]
+    end

 
     way = ways(:way_with_versions_v4)
     tags = OldWay.find(way.id).tags
 
     way = ways(:way_with_versions_v4)
     tags = OldWay.find(way.id).tags

-    assert_equal 2, tags.size
-    assert_equal "added in way version 3", tags["testing"]
-    assert_equal "modified in way version 4", tags["testing two"]
+    assert_equal taglist_v4.count, tags.count
+    taglist_v4.each do |tag|
+      assert_equal tag.v, tags[tag.k]
+    end

   end
 
   def test_get_nodes_undelete
     way = ways(:way_with_versions_v3)
   end
 
   def test_get_nodes_undelete
     way = ways(:way_with_versions_v3)

+    node_tag = create(:node_tag, :node => current_nodes(:node_with_versions))
+    node_tag2 = create(:node_tag, :node => current_nodes(:used_node_1))

     nodes = OldWay.find(way.id).get_nodes_undelete
     assert_equal 2, nodes.size
     nodes = OldWay.find(way.id).get_nodes_undelete
     assert_equal 2, nodes.size

-    assert_equal [1.0, 1.0, 15, 4, { "testing" => "added in node version 3", "testing two" => "modified in node version 4" }, true], nodes[0]
-    assert_equal [3.0, 3.0, 3, 1, { "test" => "yes" }, true], nodes[1]
+    assert_equal [1.0, 1.0, 15, 4, { node_tag.k => node_tag.v }, true], nodes[0]
+    assert_equal [3.0, 3.0, 3, 1, { node_tag2.k => node_tag2.v }, true], nodes[1]

 
     way = ways(:way_with_redacted_versions_v2)
 
     way = ways(:way_with_redacted_versions_v2)

+    node_tag3 = create(:node_tag, :node => current_nodes(:invisible_node))

     nodes = OldWay.find(way.id).get_nodes_undelete
     assert_equal 2, nodes.size
     nodes = OldWay.find(way.id).get_nodes_undelete
     assert_equal 2, nodes.size

-    assert_equal [3.0, 3.0, 3, 1, { "test" => "yes" }, true], nodes[0]
-    assert_equal [2.0, 2.0, 2, 1, { "testused" => "yes" }, false], nodes[1]
+    assert_equal [3.0, 3.0, 3, 1, { node_tag2.k => node_tag2.v }, true], nodes[0]
+    assert_equal [2.0, 2.0, 2, 1, { node_tag3.k => node_tag3.v }, false], nodes[1]

   end
 end
   end
 end