Reorganise tests to match modern rails test layout

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

diff --git a/test/unit/old_way_test.rb b/test/unit/old_way_test.rb
deleted file mode 100644 (file)
index 44975d1..0000000
--- a/test/unit/old_way_test.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-class OldWayTest < ActiveSupport::TestCase
-  api_fixtures
-
-  def test_db_count
-    assert_equal 14, OldWay.count
-  end
-
-  def test_old_nodes
-    way = ways(:way_with_multiple_nodes_v1)
-    nodes = OldWay.find(way.id).old_nodes.order(:sequence_id)
-    assert_equal 2, nodes.count
-    assert_equal 2, nodes[0].node_id
-    assert_equal 6, nodes[1].node_id
-
-    way = ways(:way_with_multiple_nodes_v2)
-    nodes = OldWay.find(way.id).old_nodes.order(:sequence_id)
-    assert_equal 3, nodes.count
-    assert_equal 4, nodes[0].node_id
-    assert_equal 15, nodes[1].node_id
-    assert_equal 6, nodes[2].node_id
-  end
-
-  def test_nds
-    way = ways(:way_with_multiple_nodes_v1)
-    nodes = OldWay.find(way.id).nds
-    assert_equal 2, nodes.count
-    assert_equal 2, nodes[0]
-    assert_equal 6, nodes[1]
-
-    way = ways(:way_with_multiple_nodes_v2)
-    nodes = OldWay.find(way.id).nds
-    assert_equal 3, nodes.count
-    assert_equal 4, nodes[0]
-    assert_equal 15, nodes[1]
-    assert_equal 6, nodes[2]
-  end
-
-  def test_way_tags
-    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_v2)
-    tags = OldWay.find(way.id).old_tags.order(:k)
-    assert_equal 0, tags.count
-
-    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
-
-    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
-  end
-
-  def test_tags
-    way = ways(:way_with_versions_v1)
-    tags = OldWay.find(way.id).tags
-    assert_equal 0, tags.size
-
-    way = ways(:way_with_versions_v2)
-    tags = OldWay.find(way.id).tags
-    assert_equal 0, tags.size
-
-    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"]
-
-    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"]
-  end
-
-  def test_get_nodes_undelete
-    way = ways(:way_with_versions_v3)
-    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]
-
-    way = ways(:way_with_redacted_versions_v2)
-    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]
-  end
-end