X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6e5240e1987a429e29d230e811af9176772a8228..99c54bc5b6c06f9457d45cdd42bd078b20ffb779:/test/models/way_test.rb
diff --git a/test/models/way_test.rb b/test/models/way_test.rb
index 341353046..6abf99c57 100644
--- a/test/models/way_test.rb
+++ b/test/models/way_test.rb
@@ -1,14 +1,6 @@
require "test_helper"
class WayTest < ActiveSupport::TestCase
- api_fixtures
-
- # Check that we have the correct number of currnet ways in the db
- # This will need to updated whenever the current_ways.yml is updated
- def test_db_count
- assert_equal 7, Way.count
- end
-
def test_bbox
node = create(:node)
visible_way = create(:way)
@@ -35,7 +27,6 @@ class WayTest < ActiveSupport::TestCase
node_c = create(:node)
way = create(:way_with_nodes, :nodes_count => 1)
# Take one of the current ways and add nodes to it until we are near the limit
- way = Way.find(current_ways(:visible_way).id)
assert way.valid?
# it already has 1 node
1.upto(MAX_NUMBER_OF_WAY_NODES / 2) do
@@ -51,7 +42,7 @@ class WayTest < ActiveSupport::TestCase
def test_from_xml_no_id
noid = ""
- assert_nothing_raised(OSM::APIBadXMLError) do
+ assert_nothing_raised do
Way.from_xml(noid, true)
end
message = assert_raise(OSM::APIBadXMLError) do
@@ -74,7 +65,7 @@ class WayTest < ActiveSupport::TestCase
def test_from_xml_no_version
no_version = ""
- assert_nothing_raised(OSM::APIBadXMLError) do
+ assert_nothing_raised do
Way.from_xml(no_version, true)
end
message_update = assert_raise(OSM::APIBadXMLError) do
@@ -87,7 +78,7 @@ class WayTest < ActiveSupport::TestCase
id_list = ["", "0", "00", "0.0", "a"]
id_list.each do |id|
zero_id = ""
- assert_nothing_raised(OSM::APIBadUserInput) do
+ assert_nothing_raised do
Way.from_xml(zero_id, true)
end
message_update = assert_raise(OSM::APIBadUserInput) do
@@ -146,34 +137,46 @@ class WayTest < ActiveSupport::TestCase
end
def test_way_nodes
- way = current_ways(:way_with_multiple_nodes)
+ way = create(:way)
+ node1 = create(:way_node, :way => way, :sequence_id => 1).node
+ node2 = create(:way_node, :way => way, :sequence_id => 2).node
+ node3 = create(:way_node, :way => way, :sequence_id => 3).node
+
nodes = Way.find(way.id).way_nodes
assert_equal 3, nodes.count
- assert_equal 4, nodes[0].node_id
- assert_equal 15, nodes[1].node_id
- assert_equal 11, nodes[2].node_id
+ assert_equal node1.id, nodes[0].node_id
+ assert_equal node2.id, nodes[1].node_id
+ assert_equal node3.id, nodes[2].node_id
end
def test_nodes
- way = current_ways(:way_with_multiple_nodes)
+ way = create(:way)
+ node1 = create(:way_node, :way => way, :sequence_id => 1).node
+ node2 = create(:way_node, :way => way, :sequence_id => 2).node
+ node3 = create(:way_node, :way => way, :sequence_id => 3).node
+
nodes = Way.find(way.id).nodes
assert_equal 3, nodes.count
- assert_equal 4, nodes[0].id
- assert_equal 15, nodes[1].id
- assert_equal 11, nodes[2].id
+ assert_equal node1.id, nodes[0].id
+ assert_equal node2.id, nodes[1].id
+ assert_equal node3.id, nodes[2].id
end
def test_nds
- way = current_ways(:way_with_multiple_nodes)
+ way = create(:way)
+ node1 = create(:way_node, :way => way, :sequence_id => 1).node
+ node2 = create(:way_node, :way => way, :sequence_id => 2).node
+ node3 = create(:way_node, :way => way, :sequence_id => 3).node
+
nodes = Way.find(way.id).nds
assert_equal 3, nodes.count
- assert_equal 4, nodes[0]
- assert_equal 15, nodes[1]
- assert_equal 11, nodes[2]
+ assert_equal node1.id, nodes[0]
+ assert_equal node2.id, nodes[1]
+ assert_equal node3.id, nodes[2]
end
def test_way_tags
- way = current_ways(:way_with_versions)
+ way = create(:way)
taglist = create_list(:way_tag, 2, :way => way)
tags = Way.find(way.id).way_tags.order(:k)
assert_equal taglist.count, tags.count
@@ -184,7 +187,7 @@ class WayTest < ActiveSupport::TestCase
end
def test_tags
- way = current_ways(:way_with_versions)
+ way = create(:way)
taglist = create_list(:way_tag, 2, :way => way)
tags = Way.find(way.id).tags
assert_equal taglist.count, tags.count
@@ -194,19 +197,25 @@ class WayTest < ActiveSupport::TestCase
end
def test_containing_relation_members
- way = current_ways(:used_way)
+ way = create(:way)
+ relation = create(:relation)
+ create(:relation_member, :relation => relation, :member => way)
+
crm = Way.find(way.id).containing_relation_members.order(:relation_id)
# assert_equal 1, crm.size
- assert_equal 1, crm.first.relation_id
+ assert_equal relation.id, crm.first.relation_id
assert_equal "Way", crm.first.member_type
assert_equal way.id, crm.first.member_id
- assert_equal 1, crm.first.relation.id
+ assert_equal relation.id, crm.first.relation.id
end
def test_containing_relations
- way = current_ways(:used_way)
+ way = create(:way)
+ relation = create(:relation)
+ create(:relation_member, :relation => relation, :member => way)
+
cr = Way.find(way.id).containing_relations.order(:id)
assert_equal 1, cr.size
- assert_equal 1, cr.first.id
+ assert_equal relation.id, cr.first.id
end
end