api_fixtures
def test_node_count
- assert_equal 16, Node.count
+ assert_equal 17, Node.count
end
def test_node_too_far_north
- invalid_node_test(:node_too_far_north)
+ invalid_node_test(:node_too_far_north)
end
def test_node_north_limit
# Check that you can create a node and store it
def test_create
- node_template = Node.new(:latitude => 12.3456,
- :longitude => 65.4321,
- :changeset_id => changesets(:normal_user_first_change).id,
- :visible => 1,
- :version => 1)
+ node_template = Node.new(
+ :latitude => 12.3456,
+ :longitude => 65.4321,
+ :changeset_id => changesets(:normal_user_first_change).id,
+ :visible => 1,
+ :version => 1
+ )
assert node_template.create_with_history(users(:normal_user))
node = Node.find(node_template.id)
assert_equal node_template.visible, node.visible
assert_equal node_template.timestamp.to_i, node.timestamp.to_i
- assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 1
- old_node = OldNode.find(:first, :conditions => [ "id = ?", node_template.id ])
+ assert_equal OldNode.where(:node_id => node_template.id).count, 1
+ old_node = OldNode.where(:node_id => node_template.id).first
assert_not_nil old_node
assert_equal node_template.latitude, old_node.latitude
assert_equal node_template.longitude, old_node.longitude
node_template = Node.find(current_nodes(:visible_node).id)
assert_not_nil node_template
- assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 1
- old_node_template = OldNode.find(:first, :conditions => [ "id = ?", node_template.id ])
- assert_not_nil old_node_template
+ assert_equal OldNode.where(:node_id => node_template.id).count, 1
+ node = Node.find(node_template.id)
+ assert_not_nil node
node_template.latitude = 12.3456
node_template.longitude = 65.4321
#node_template.tags = "updated=yes"
- assert node_template.update_from(old_node_template, users(:normal_user))
+ assert node.update_from(node_template, users(:normal_user))
node = Node.find(node_template.id)
assert_not_nil node
assert_equal node_template.changeset_id, node.changeset_id
assert_equal node_template.visible, node.visible
#assert_equal node_template.tags, node.tags
- assert_equal node_template.timestamp.to_i, node.timestamp.to_i
- assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 2
- assert_equal OldNode.find(:all, :conditions => [ "id = ? and timestamp = ?", node_template.id, node_template.timestamp ]).length, 1
- old_node = OldNode.find(:first, :conditions => [ "id = ? and timestamp = ?", node_template.id, node_template.timestamp ])
+ assert_equal OldNode.where(:node_id => node_template.id).count, 2
+ old_node = OldNode.where(:node_id => node_template.id, :version => 2).first
assert_not_nil old_node
assert_equal node_template.latitude, old_node.latitude
assert_equal node_template.longitude, old_node.longitude
assert_equal node_template.changeset_id, old_node.changeset_id
assert_equal node_template.visible, old_node.visible
#assert_equal node_template.tags, old_node.tags
- assert_equal node_template.timestamp.to_i, old_node.timestamp.to_i
end
def test_delete
node_template = Node.find(current_nodes(:visible_node))
assert_not_nil node_template
- assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 1
- old_node_template = OldNode.find(:first, :conditions => [ "id = ?", node_template.id ])
- assert_not_nil old_node_template
+ assert_equal OldNode.where(:node_id => node_template.id).count, 1
+ node = Node.find(node_template.id)
+ assert_not_nil node
- assert node_template.delete_with_history!(old_node_template, users(:normal_user))
+ assert node.delete_with_history!(node_template, users(:normal_user))
node = Node.find(node_template.id)
assert_not_nil node
assert_equal node_template.latitude, node.latitude
assert_equal node_template.longitude, node.longitude
assert_equal node_template.changeset_id, node.changeset_id
- assert_equal node_template.visible, node.visible
+ assert_equal false, node.visible
#assert_equal node_template.tags, node.tags
- assert_equal node_template.timestamp.to_i, node.timestamp.to_i
- assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 2
- assert_equal OldNode.find(:all, :conditions => [ "id = ? and timestamp = ?", node_template.id, node_template.timestamp ]).length, 1
- old_node = OldNode.find(:first, :conditions => [ "id = ? and timestamp = ?", node_template.id, node_template.timestamp ])
+ assert_equal OldNode.where(:node_id => node_template.id).count, 2
+ old_node = OldNode.where(:node_id => node_template.id, :version => 2).first
assert_not_nil old_node
assert_equal node_template.latitude, old_node.latitude
assert_equal node_template.longitude, old_node.longitude
assert_equal node_template.changeset_id, old_node.changeset_id
- assert_equal node_template.visible, old_node.visible
+ assert_equal false, old_node.visible
#assert_equal node_template.tags, old_node.tags
- assert_equal node_template.timestamp.to_i, old_node.timestamp.to_i
end
def test_from_xml_no_id
message_update = assert_raise(OSM::APIBadXMLError) {
Node.from_xml(no_text, false)
}
- assert_match /Must specify a string with one or more characters/, message_create.message
+ assert_match /Must specify a string with one or more characters/, message_update.message
+ end
+
+ def test_from_xml_no_node
+ no_node = "<osm></osm>"
+ message_create = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(no_node, true)
+ }
+ assert_match /XML doesn't contain an osm\/node element/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(no_node, false)
+ }
+ assert_match /XML doesn't contain an osm\/node element/, message_update.message
+ end
+
+ def test_from_xml_no_k_v
+ nokv = "<osm><node id='23' lat='12.3' lon='23.4' changeset='12' version='23'><tag /></node></osm>"
+ message_create = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(nokv, true)
+ }
+ assert_match /tag is missing key/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(nokv, false)
+ }
+ assert_match /tag is missing key/, message_update.message
+ end
+
+ def test_from_xml_no_v
+ no_v = "<osm><node id='23' lat='23.43' lon='23.32' changeset='23' version='32'><tag k='key' /></node></osm>"
+ message_create = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(no_v, true)
+ }
+ assert_match /tag is missing value/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(no_v, false)
+ }
+ assert_match /tag is missing value/, message_update.message
+ end
+
+ def test_from_xml_duplicate_k
+ dupk = "<osm><node id='23' lat='23.2' lon='23' changeset='34' version='23'><tag k='dup' v='test' /><tag k='dup' v='tester' /></node></osm>"
+ message_create = assert_raise(OSM::APIDuplicateTagsError) {
+ Node.from_xml(dupk, true)
+ }
+ assert_equal "Element node/ has duplicate tags with key dup", message_create.message
+ message_update = assert_raise(OSM::APIDuplicateTagsError) {
+ Node.from_xml(dupk, false)
+ }
+ assert_equal "Element node/23 has duplicate tags with key dup", message_update.message
+ end
+
+ def test_node_tags
+ node = current_nodes(:node_with_versions)
+ tags = Node.find(node.id).node_tags.order(:k)
+ assert_equal 2, tags.count
+ assert_equal "testing", tags[0].k
+ assert_equal "added in node version 3", tags[0].v
+ assert_equal "testing two", tags[1].k
+ assert_equal "modified in node version 4", tags[1].v
+ end
+
+ def test_tags
+ node = current_nodes(:node_with_versions)
+ tags = Node.find(node.id).tags
+ assert_equal 2, tags.size
+ assert_equal "added in node version 3", tags["testing"]
+ assert_equal "modified in node version 4", tags["testing two"]
end
end
projects / rails.git / blobdiff