Get rid of hardwired counts in assertions

diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index 68c45782d65c1326e6c96c22ea53a0e10adb27c0..7d43362d22983fa6d61d0443e8526552479e4946 100644 (file)
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -318,7 +318,7 @@ class NodeTest < ActiveSupport::TestCase
     node = current_nodes(:node_with_versions)
     taglist = create_list(:node_tag, 2, :node => node)
     tags = Node.find(node.id).node_tags.order(:k)
-    assert_equal 2, tags.count
+    assert_equal taglist.count, tags.count
     taglist.sort_by!(&:k).each_index do |i|
       assert_equal taglist[i].k, tags[i].k
       assert_equal taglist[i].v, tags[i].v
@@ -329,7 +329,7 @@ class NodeTest < ActiveSupport::TestCase
     node = current_nodes(:node_with_versions)
     taglist = create_list(:node_tag, 2, :node => node)
     tags = Node.find(node.id).tags
-    assert_equal 2, tags.size
+    assert_equal taglist.count, tags.count
     taglist.each do |tag|
       assert_equal tag.v, tags[tag.k]
     end

diff --git a/test/models/old_node_test.rb b/test/models/old_node_test.rb
index a4c317c02ab60a5d8c540f8931d5f41852fd54d7..d7e363edbfb0af0587e76ce1538a68cf3349cba9 100644 (file)
--- a/test/models/old_node_test.rb
+++ b/test/models/old_node_test.rb
@@ -89,7 +89,7 @@ class OldNodeTest < ActiveSupport::TestCase
 
     node = nodes(:node_with_versions_v3)
     tags = OldNode.find(node.id).old_tags.order(:k)
-    assert_equal 3, tags.count
+    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
@@ -97,7 +97,7 @@ class OldNodeTest < ActiveSupport::TestCase
 
     node = nodes(:node_with_versions_v4)
     tags = OldNode.find(node.id).old_tags.order(:k)
-    assert_equal 2, tags.count
+    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
@@ -118,14 +118,14 @@ class OldNodeTest < ActiveSupport::TestCase
 
     node = nodes(:node_with_versions_v3)
     tags = OldNode.find(node.id).tags
-    assert_equal 3, tags.size
+    assert_equal taglist_v3.count, tags.count
     taglist_v3.each do |tag|
       assert_equal tag.v, tags[tag.k]
     end
 
     node = nodes(:node_with_versions_v4)
     tags = OldNode.find(node.id).tags
-    assert_equal 2, tags.size
+    assert_equal taglist_v4.count, tags.count
     taglist_v4.each do |tag|
       assert_equal tag.v, tags[tag.k]
     end

diff --git a/test/models/old_relation_test.rb b/test/models/old_relation_test.rb
index 8b7b5e1f81fcef18936100e3acabdfd9ea58fb17..d2aa4b6b6d8b78f77c95ab463d6e4b7e0e64ac6e 100644 (file)
--- a/test/models/old_relation_test.rb
+++ b/test/models/old_relation_test.rb
@@ -21,7 +21,7 @@ class OldRelationTest < ActiveSupport::TestCase
 
     relation = relations(:relation_with_versions_v3)
     tags = OldRelation.find(relation.id).old_tags.order(:k)
-    assert_equal 3, tags.count
+    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
@@ -29,7 +29,7 @@ class OldRelationTest < ActiveSupport::TestCase
 
     relation = relations(:relation_with_versions_v4)
     tags = OldRelation.find(relation.id).old_tags.order(:k)
-    assert_equal 2, tags.count
+    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
@@ -114,14 +114,14 @@ class OldRelationTest < ActiveSupport::TestCase
 
     relation = relations(:relation_with_versions_v3)
     tags = OldRelation.find(relation.id).tags
-    assert_equal 3, tags.size
+    assert_equal taglist_v3.count, tags.count
     taglist_v3.each do |tag|
       assert_equal tag.v, tags[tag.k]
     end
 
     relation = relations(:relation_with_versions_v4)
     tags = OldRelation.find(relation.id).tags
-    assert_equal 2, tags.size
+    assert_equal taglist_v4.count, tags.count
     taglist_v4.each do |tag|
       assert_equal tag.v, tags[tag.k]
     end

diff --git a/test/models/old_way_test.rb b/test/models/old_way_test.rb
index 3acd7dba7ee2269ccc3456cdb91bf69a47d256cb..84255c8807d5432f2adf84de3b0eceffe13358f1 100644 (file)
--- a/test/models/old_way_test.rb
+++ b/test/models/old_way_test.rb
@@ -51,7 +51,7 @@ class OldWayTest < ActiveSupport::TestCase
 
     way = ways(:way_with_versions_v3)
     tags = OldWay.find(way.id).old_tags.order(:k)
-    assert_equal 3, tags.count
+    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
@@ -59,7 +59,7 @@ class OldWayTest < ActiveSupport::TestCase
 
     way = ways(:way_with_versions_v4)
     tags = OldWay.find(way.id).old_tags.order(:k)
-    assert_equal 2, tags.count
+    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
@@ -80,14 +80,14 @@ class OldWayTest < ActiveSupport::TestCase
 
     way = ways(:way_with_versions_v3)
     tags = OldWay.find(way.id).tags
-    assert_equal 3, tags.size
+    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
-    assert_equal 2, tags.size
+    assert_equal taglist_v4.count, tags.count
     taglist_v4.each do |tag|
       assert_equal tag.v, tags[tag.k]
     end

diff --git a/test/models/relation_test.rb b/test/models/relation_test.rb
index cb3330abe45b5721293ef2d60b038de4689ddd1d..b095024a64b8c23a771b7fa1a5132b2d0d905ef4 100644 (file)
--- a/test/models/relation_test.rb
+++ b/test/models/relation_test.rb
@@ -132,7 +132,7 @@ class RelationTest < ActiveSupport::TestCase
     taglist = create_list(:relation_tag, 2, :relation => relation)
 
     tags = Relation.find(relation.id).relation_tags.order(:k)
-    assert_equal 2, tags.count
+    assert_equal taglist.count, tags.count
     taglist.sort_by!(&:k).each_index do |i|
       assert_equal taglist[i].k, tags[i].k
       assert_equal taglist[i].v, tags[i].v
@@ -144,7 +144,7 @@ class RelationTest < ActiveSupport::TestCase
     taglist = create_list(:relation_tag, 2, :relation => relation)
 
     tags = Relation.find(relation.id).tags
-    assert_equal 2, tags.size
+    assert_equal taglist.count, tags.count
     taglist.each do |tag|
       assert_equal tag.v, tags[tag.k]
     end

diff --git a/test/models/way_test.rb b/test/models/way_test.rb
index 654076eecb0ebcd09c0792eb399b8a04e1d22c53..807b71d5bf63d200b151ec7f80e0a6a9eda37751 100644 (file)
--- a/test/models/way_test.rb
+++ b/test/models/way_test.rb
@@ -167,7 +167,7 @@ class WayTest < ActiveSupport::TestCase
     way = current_ways(:way_with_versions)
     taglist = create_list(:way_tag, 2, :way => way)
     tags = Way.find(way.id).way_tags.order(:k)
-    assert_equal 2, tags.count
+    assert_equal taglist.count, tags.count
     taglist.sort_by!(&:k).each_index do |i|
       assert_equal taglist[i].k, tags[i].k
       assert_equal taglist[i].v, tags[i].v
@@ -178,7 +178,7 @@ class WayTest < ActiveSupport::TestCase
     way = current_ways(:way_with_versions)
     taglist = create_list(:way_tag, 2, :way => way)
     tags = Way.find(way.id).tags
-    assert_equal 2, tags.size
+    assert_equal taglist.count, tags.count
     taglist.each do |tag|
       assert_equal tag.v, tags[tag.k]
     end