Merge remote-tracking branch 'upstream/pull/2413'

[rails.git] / test / models / node_test.rb

diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index cf60c84ec96afa42ade1affc6d15cc6d5a08548c..d6fa1cd8f32d35d4fca07636a9373dffadc8897b 100644 (file)
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -1,51 +1,58 @@
 require "test_helper"
 
 class NodeTest < ActiveSupport::TestCase
 require "test_helper"
 
 class NodeTest < ActiveSupport::TestCase

-  api_fixtures
-

   def test_node_too_far_north
     node = build(:node, :latitude => 90.01 * OldNode::SCALE)
   def test_node_too_far_north
     node = build(:node, :latitude => 90.01 * OldNode::SCALE)

-    assert_equal false, node.valid?
+    node.validate
+    assert node.errors.full_messages.include?("Node is not in the world")

   end
 
   def test_node_north_limit
     node = build(:node, :latitude => 90 * OldNode::SCALE)
   end
 
   def test_node_north_limit
     node = build(:node, :latitude => 90 * OldNode::SCALE)

-    assert node.valid?
+    node.validate
+    assert_equal false, node.errors.full_messages.include?("Node is not in the world")

   end
 
   def test_node_too_far_south
     node = build(:node, :latitude => -90.01 * OldNode::SCALE)
   end
 
   def test_node_too_far_south
     node = build(:node, :latitude => -90.01 * OldNode::SCALE)

-    assert_equal false, node.valid?
+    node.validate
+    assert node.errors.full_messages.include?("Node is not in the world")

   end
 
   def test_node_south_limit
     node = build(:node, :latitude => -90 * OldNode::SCALE)
   end
 
   def test_node_south_limit
     node = build(:node, :latitude => -90 * OldNode::SCALE)

-    assert node.valid?
+    node.validate
+    assert_equal false, node.errors.full_messages.include?("Node is not in the world")

   end
 
   def test_node_too_far_west
     node = build(:node, :longitude => -180.01 * OldNode::SCALE)
   end
 
   def test_node_too_far_west
     node = build(:node, :longitude => -180.01 * OldNode::SCALE)

-    assert_equal false, node.valid?
+    node.validate
+    assert node.errors.full_messages.include?("Node is not in the world")

   end
 
   def test_node_west_limit
     node = build(:node, :longitude => -180 * OldNode::SCALE)
   end
 
   def test_node_west_limit
     node = build(:node, :longitude => -180 * OldNode::SCALE)

-    assert node.valid?
+    node.validate
+    assert_equal false, node.errors.full_messages.include?("Node is not in the world")

   end
 
   def test_node_too_far_east
     node = build(:node, :longitude => 180.01 * OldNode::SCALE)
   end
 
   def test_node_too_far_east
     node = build(:node, :longitude => 180.01 * OldNode::SCALE)

-    assert_equal false, node.valid?
+    node.validate
+    assert node.errors.full_messages.include?("Node is not in the world")

   end
 
   def test_node_east_limit
     node = build(:node, :longitude => 180 * OldNode::SCALE)
   end
 
   def test_node_east_limit
     node = build(:node, :longitude => 180 * OldNode::SCALE)

-    assert node.valid?
+    node.validate
+    assert_equal false, node.errors.full_messages.include?("Node is not in the world")

   end
 
   def test_totally_wrong
     node = build(:node, :latitude => 200 * OldNode::SCALE, :longitude => 200 * OldNode::SCALE)
   end
 
   def test_totally_wrong
     node = build(:node, :latitude => 200 * OldNode::SCALE, :longitude => 200 * OldNode::SCALE)

-    assert_equal false, node.valid?
+    node.validate
+    assert node.errors.full_messages.include?("Node is not in the world")

   end
 
   def test_lat_lon
   end
 
   def test_lat_lon


@@ -65,16 +72,16 @@ class NodeTest < ActiveSupport::TestCase
   def test_lat_lon_xml_format
     node = build(:node, :latitude => 0.00004 * OldNode::SCALE, :longitude => 0.00008 * OldNode::SCALE)
 
   def test_lat_lon_xml_format
     node = build(:node, :latitude => 0.00004 * OldNode::SCALE, :longitude => 0.00008 * OldNode::SCALE)
 

-    assert_match /lat="0.0000400"/, node.to_xml.to_s
-    assert_match /lon="0.0000800"/, node.to_xml.to_s
+    assert_match(/lat="0.0000400"/, node.to_xml.to_s)
+    assert_match(/lon="0.0000800"/, node.to_xml.to_s)

   end
 
   # Check that you can create a node and store it
   def test_create
     changeset = create(:changeset)
     node_template = Node.new(
   end
 
   # Check that you can create a node and store it
   def test_create
     changeset = create(:changeset)
     node_template = Node.new(

-      :latitude => 12.3456,
-      :longitude => 65.4321,
+      :lat => 12.3456,
+      :lon => 65.4321,

       :changeset_id => changeset.id,
       :visible => 1,
       :version => 1
       :changeset_id => changeset.id,
       :visible => 1,
       :version => 1


@@ -109,8 +116,8 @@ class NodeTest < ActiveSupport::TestCase
     assert_equal OldNode.where(:node_id => node_template.id).count, 1
     assert_not_nil node
 
     assert_equal OldNode.where(:node_id => node_template.id).count, 1
     assert_not_nil node
 

-    node_template.latitude = 12.3456
-    node_template.longitude = 65.4321
+    node_template.lat = 12.3456
+    node_template.lon = 65.4321

     # node_template.tags = "updated=yes"
     assert node.update_from(node_template, node.changeset.user)
 
     # node_template.tags = "updated=yes"
     assert node.update_from(node_template, node.changeset.user)
 


@@ -168,14 +175,14 @@ class NodeTest < ActiveSupport::TestCase
     version = 1
     noid = "<osm><node lat='#{lat}' lon='#{lon}' changeset='#{changeset}' version='#{version}' /></osm>"
     # First try a create which doesn't need the id
     version = 1
     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(OSM::APIBadXMLError) do
+    assert_nothing_raised do

       Node.from_xml(noid, 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)
     end
       Node.from_xml(noid, 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)
     end

-    assert_match /ID is required when updating./, message.message
+    assert_match(/ID is required when updating./, message.message)

   end
 
   def test_from_xml_no_lat
   end
 
   def test_from_xml_no_lat


@@ -183,11 +190,11 @@ class NodeTest < ActiveSupport::TestCase
     message_create = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(nolat, true)
     end
     message_create = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(nolat, true)
     end

-    assert_match /lat missing/, message_create.message
+    assert_match(/lat missing/, message_create.message)

     message_update = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(nolat, false)
     end
     message_update = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(nolat, false)
     end

-    assert_match /lat missing/, message_update.message
+    assert_match(/lat missing/, message_update.message)

   end
 
   def test_from_xml_no_lon
   end
 
   def test_from_xml_no_lon


@@ -195,11 +202,11 @@ class NodeTest < ActiveSupport::TestCase
     message_create = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(nolon, true)
     end
     message_create = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(nolon, true)
     end

-    assert_match /lon missing/, message_create.message
+    assert_match(/lon missing/, message_create.message)

     message_update = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(nolon, false)
     end
     message_update = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(nolon, false)
     end

-    assert_match /lon missing/, message_update.message
+    assert_match(/lon missing/, message_update.message)

   end
 
   def test_from_xml_no_changeset_id
   end
 
   def test_from_xml_no_changeset_id


@@ -207,22 +214,22 @@ class NodeTest < ActiveSupport::TestCase
     message_create = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(nocs, true)
     end
     message_create = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(nocs, true)
     end

-    assert_match /Changeset id is missing/, message_create.message
+    assert_match(/Changeset id is missing/, message_create.message)

     message_update = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(nocs, false)
     end
     message_update = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(nocs, false)
     end

-    assert_match /Changeset id is missing/, message_update.message
+    assert_match(/Changeset id is missing/, message_update.message)

   end
 
   def test_from_xml_no_version
     no_version = "<osm><node id='123' lat='23' lon='23' changeset='23' /></osm>"
   end
 
   def test_from_xml_no_version
     no_version = "<osm><node id='123' lat='23' lon='23' changeset='23' /></osm>"

-    assert_nothing_raised(OSM::APIBadXMLError) do
+    assert_nothing_raised do

       Node.from_xml(no_version, true)
     end
     message_update = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(no_version, false)
     end
       Node.from_xml(no_version, true)
     end
     message_update = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(no_version, false)
     end

-    assert_match /Version is required when updating/, message_update.message
+    assert_match(/Version is required when updating/, message_update.message)

   end
 
   def test_from_xml_double_lat
   end
 
   def test_from_xml_double_lat


@@ -230,24 +237,24 @@ class NodeTest < ActiveSupport::TestCase
     message_create = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(nocs, true)
     end
     message_create = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(nocs, true)
     end

-    assert_match /Fatal error: Attribute lat redefined at/, message_create.message
+    assert_match(/Fatal error: Attribute lat redefined at/, message_create.message)

     message_update = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(nocs, false)
     end
     message_update = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(nocs, false)
     end

-    assert_match /Fatal error: Attribute lat redefined at/, message_update.message
+    assert_match(/Fatal error: Attribute lat redefined at/, message_update.message)

   end
 
   def test_from_xml_id_zero
     id_list = ["", "0", "00", "0.0", "a"]
     id_list.each do |id|
       zero_id = "<osm><node id='#{id}' lat='12.3' lon='12.3' changeset='33' version='23' /></osm>"
   end
 
   def test_from_xml_id_zero
     id_list = ["", "0", "00", "0.0", "a"]
     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(OSM::APIBadUserInput) do
+      assert_nothing_raised do

         Node.from_xml(zero_id, true)
       end
       message_update = assert_raise(OSM::APIBadUserInput) do
         Node.from_xml(zero_id, false)
       end
         Node.from_xml(zero_id, true)
       end
       message_update = assert_raise(OSM::APIBadUserInput) do
         Node.from_xml(zero_id, false)
       end

-      assert_match /ID of node cannot be zero when updating/, message_update.message
+      assert_match(/ID of node cannot be zero when updating/, message_update.message)

     end
   end
 
     end
   end
 


@@ -256,11 +263,11 @@ class NodeTest < ActiveSupport::TestCase
     message_create = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(no_text, true)
     end
     message_create = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(no_text, true)
     end

-    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_create.message)

     message_update = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(no_text, false)
     end
     message_update = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(no_text, false)
     end

-    assert_match /Must specify a string with one or more characters/, message_update.message
+    assert_match(/Must specify a string with one or more characters/, message_update.message)

   end
 
   def test_from_xml_no_node
   end
 
   def test_from_xml_no_node


@@ -280,11 +287,11 @@ class NodeTest < ActiveSupport::TestCase
     message_create = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(nokv, true)
     end
     message_create = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(nokv, true)
     end

-    assert_match /tag is missing key/, message_create.message
+    assert_match(/tag is missing key/, message_create.message)

     message_update = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(nokv, false)
     end
     message_update = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(nokv, false)
     end

-    assert_match /tag is missing key/, message_update.message
+    assert_match(/tag is missing key/, message_update.message)

   end
 
   def test_from_xml_no_v
   end
 
   def test_from_xml_no_v


@@ -292,11 +299,11 @@ class NodeTest < ActiveSupport::TestCase
     message_create = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(no_v, true)
     end
     message_create = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(no_v, true)
     end

-    assert_match /tag is missing value/, message_create.message
+    assert_match(/tag is missing value/, message_create.message)

     message_update = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(no_v, false)
     end
     message_update = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(no_v, false)
     end

-    assert_match /tag is missing value/, message_update.message
+    assert_match(/tag is missing value/, message_update.message)

   end
 
   def test_from_xml_duplicate_k
   end
 
   def test_from_xml_duplicate_k