X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/64b3e289ac14533c6fb2b1223b6417ad0446878c..e2e79ba549a7c2f668ccb9b0fab7d6245cb826c5:/test/models/node_test.rb?ds=inline

diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index 5733d5063..2e6108234 100644
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -71,13 +71,11 @@ class NodeTest < ActiveSupport::TestCase
   # Check that you can create a node and store it
   def test_create
     changeset = create(:changeset)
-    node_template = Node.new(
-      :lat => 12.3456,
-      :lon => 65.4321,
-      :changeset_id => changeset.id,
-      :visible => 1,
-      :version => 1
-    )
+    node_template = build(:node, :lat => 12.3456,
+                                 :lon => 65.4321,
+                                 :changeset_id => changeset.id,
+                                 :visible => true,
+                                 :version => 1)
     assert node_template.create_with_history(changeset.user)
 
     node = Node.find(node_template.id)
@@ -88,7 +86,7 @@ class NodeTest < ActiveSupport::TestCase
     assert_equal node_template.visible, node.visible
     assert_equal node_template.timestamp.to_i, node.timestamp.to_i
 
-    assert_equal OldNode.where(:node_id => node_template.id).count, 1
+    assert_equal(1, OldNode.where(:node_id => node_template.id).count)
     old_node = OldNode.where(:node_id => node_template.id).first
     assert_not_nil old_node
     assert_equal node_template.latitude, old_node.latitude
@@ -105,7 +103,7 @@ class NodeTest < ActiveSupport::TestCase
     node_template = Node.find(node.id)
 
     assert_not_nil node_template
-    assert_equal OldNode.where(:node_id => node_template.id).count, 1
+    assert_equal(1, OldNode.where(:node_id => node_template.id).count)
     assert_not_nil node
 
     node_template.lat = 12.3456
@@ -121,7 +119,7 @@ class NodeTest < ActiveSupport::TestCase
     assert_equal node_template.visible, node.visible
     # assert_equal node_template.tags, node.tags
 
-    assert_equal OldNode.where(:node_id => node_template.id).count, 2
+    assert_equal(2, OldNode.where(:node_id => node_template.id).count)
     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
@@ -137,7 +135,7 @@ class NodeTest < ActiveSupport::TestCase
     node_template = Node.find(node.id)
 
     assert_not_nil node_template
-    assert_equal OldNode.where(:node_id => node_template.id).count, 1
+    assert_equal(1, OldNode.where(:node_id => node_template.id).count)
     assert_not_nil node
 
     assert node.delete_with_history!(node_template, node.changeset.user)
@@ -150,7 +148,7 @@ class NodeTest < ActiveSupport::TestCase
     assert_not node.visible
     # assert_equal node_template.tags, node.tags
 
-    assert_equal OldNode.where(:node_id => node_template.id).count, 2
+    assert_equal(2, OldNode.where(:node_id => node_template.id).count)
     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
@@ -168,11 +166,11 @@ class NodeTest < ActiveSupport::TestCase
     noid = "<osm><node lat='#{lat}' lon='#{lon}' changeset='#{changeset}' version='#{version}' /></osm>"
     # First try a create which doesn't need the id
     assert_nothing_raised do
-      Node.from_xml(noid, true)
+      Node.from_xml(noid, :create => true)
     end
     # Now try an update with no id, and make sure that it gives the appropriate exception
     message = assert_raise(OSM::APIBadXMLError) do
-      Node.from_xml(noid, false)
+      Node.from_xml(noid, :create => false)
     end
     assert_match(/ID is required when updating./, message.message)
   end
@@ -180,11 +178,11 @@ class NodeTest < ActiveSupport::TestCase
   def test_from_xml_no_lat
     nolat = "<osm><node id='1' lon='23.3' changeset='2' version='23' /></osm>"
     message_create = assert_raise(OSM::APIBadXMLError) do
-      Node.from_xml(nolat, true)
+      Node.from_xml(nolat, :create => true)
     end
     assert_match(/lat missing/, message_create.message)
     message_update = assert_raise(OSM::APIBadXMLError) do
-      Node.from_xml(nolat, false)
+      Node.from_xml(nolat, :create => false)
     end
     assert_match(/lat missing/, message_update.message)
   end
@@ -192,11 +190,11 @@ class NodeTest < ActiveSupport::TestCase
   def test_from_xml_no_lon
     nolon = "<osm><node id='1' lat='23.1' changeset='2' version='23' /></osm>"
     message_create = assert_raise(OSM::APIBadXMLError) do
-      Node.from_xml(nolon, true)
+      Node.from_xml(nolon, :create => true)
     end
     assert_match(/lon missing/, message_create.message)
     message_update = assert_raise(OSM::APIBadXMLError) do
-      Node.from_xml(nolon, false)
+      Node.from_xml(nolon, :create => false)
     end
     assert_match(/lon missing/, message_update.message)
   end
@@ -204,11 +202,11 @@ class NodeTest < ActiveSupport::TestCase
   def test_from_xml_no_changeset_id
     nocs = "<osm><node id='123' lon='23.23' lat='23.1' version='23' /></osm>"
     message_create = assert_raise(OSM::APIBadXMLError) do
-      Node.from_xml(nocs, true)
+      Node.from_xml(nocs, :create => true)
     end
     assert_match(/Changeset id is missing/, message_create.message)
     message_update = assert_raise(OSM::APIBadXMLError) do
-      Node.from_xml(nocs, false)
+      Node.from_xml(nocs, :create => false)
     end
     assert_match(/Changeset id is missing/, message_update.message)
   end
@@ -216,10 +214,10 @@ class NodeTest < ActiveSupport::TestCase
   def test_from_xml_no_version
     no_version = "<osm><node id='123' lat='23' lon='23' changeset='23' /></osm>"
     assert_nothing_raised do
-      Node.from_xml(no_version, true)
+      Node.from_xml(no_version, :create => true)
     end
     message_update = assert_raise(OSM::APIBadXMLError) do
-      Node.from_xml(no_version, false)
+      Node.from_xml(no_version, :create => false)
     end
     assert_match(/Version is required when updating/, message_update.message)
   end
@@ -227,11 +225,11 @@ class NodeTest < ActiveSupport::TestCase
   def test_from_xml_double_lat
     nocs = "<osm><node id='123' lon='23.23' lat='23.1' lat='12' changeset='23' version='23' /></osm>"
     message_create = assert_raise(OSM::APIBadXMLError) do
-      Node.from_xml(nocs, true)
+      Node.from_xml(nocs, :create => true)
     end
     assert_match(/Fatal error: Attribute lat redefined at/, message_create.message)
     message_update = assert_raise(OSM::APIBadXMLError) do
-      Node.from_xml(nocs, false)
+      Node.from_xml(nocs, :create => false)
     end
     assert_match(/Fatal error: Attribute lat redefined at/, message_update.message)
   end
@@ -241,10 +239,10 @@ class NodeTest < ActiveSupport::TestCase
     id_list.each do |id|
       zero_id = "<osm><node id='#{id}' lat='12.3' lon='12.3' changeset='33' version='23' /></osm>"
       assert_nothing_raised do
-        Node.from_xml(zero_id, true)
+        Node.from_xml(zero_id, :create => true)
       end
       message_update = assert_raise(OSM::APIBadUserInput) do
-        Node.from_xml(zero_id, false)
+        Node.from_xml(zero_id, :create => false)
       end
       assert_match(/ID of node cannot be zero when updating/, message_update.message)
     end
@@ -253,11 +251,11 @@ class NodeTest < ActiveSupport::TestCase
   def test_from_xml_no_text
     no_text = ""
     message_create = assert_raise(OSM::APIBadXMLError) do
-      Node.from_xml(no_text, true)
+      Node.from_xml(no_text, :create => true)
     end
     assert_match(/Must specify a string with one or more characters/, message_create.message)
     message_update = assert_raise(OSM::APIBadXMLError) do
-      Node.from_xml(no_text, false)
+      Node.from_xml(no_text, :create => false)
     end
     assert_match(/Must specify a string with one or more characters/, message_update.message)
   end
@@ -265,11 +263,11 @@ class NodeTest < ActiveSupport::TestCase
   def test_from_xml_no_node
     no_node = "<osm></osm>"
     message_create = assert_raise(OSM::APIBadXMLError) do
-      Node.from_xml(no_node, true)
+      Node.from_xml(no_node, :create => true)
     end
     assert_match %r{XML doesn't contain an osm/node element}, message_create.message
     message_update = assert_raise(OSM::APIBadXMLError) do
-      Node.from_xml(no_node, false)
+      Node.from_xml(no_node, :create => false)
     end
     assert_match %r{XML doesn't contain an osm/node element}, message_update.message
   end
@@ -277,11 +275,11 @@ class NodeTest < ActiveSupport::TestCase
   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) do
-      Node.from_xml(nokv, true)
+      Node.from_xml(nokv, :create => true)
     end
     assert_match(/tag is missing key/, message_create.message)
     message_update = assert_raise(OSM::APIBadXMLError) do
-      Node.from_xml(nokv, false)
+      Node.from_xml(nokv, :create => false)
     end
     assert_match(/tag is missing key/, message_update.message)
   end
@@ -289,11 +287,11 @@ class NodeTest < ActiveSupport::TestCase
   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) do
-      Node.from_xml(no_v, true)
+      Node.from_xml(no_v, :create => true)
     end
     assert_match(/tag is missing value/, message_create.message)
     message_update = assert_raise(OSM::APIBadXMLError) do
-      Node.from_xml(no_v, false)
+      Node.from_xml(no_v, :create => false)
     end
     assert_match(/tag is missing value/, message_update.message)
   end
@@ -301,11 +299,11 @@ class NodeTest < ActiveSupport::TestCase
   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) do
-      Node.from_xml(dupk, true)
+      Node.from_xml(dupk, :create => true)
     end
     assert_equal "Element node/ has duplicate tags with key dup", message_create.message
     message_update = assert_raise(OSM::APIDuplicateTagsError) do
-      Node.from_xml(dupk, false)
+      Node.from_xml(dupk, :create => false)
     end
     assert_equal "Element node/23 has duplicate tags with key dup", message_update.message
   end