X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/aa1fb6dbb8c2e71b8ce8c231ae1272a2dfebd75a..30da09c5a1d0a788c3becae49cdeee822c23b298:/test/models/way_test.rb?ds=inline diff --git a/test/models/way_test.rb b/test/models/way_test.rb index 6abf99c57..36debfac0 100644 --- a/test/models/way_test.rb +++ b/test/models/way_test.rb @@ -27,51 +27,50 @@ 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 - assert way.valid? + assert_predicate way, :valid? # it already has 1 node - 1.upto(MAX_NUMBER_OF_WAY_NODES / 2) do + 1.upto(Settings.max_number_of_way_nodes / 2) do way.add_nd_num(node_a.id) way.add_nd_num(node_b.id) end way.save - # print way.nds.size - assert way.valid? + assert_predicate way, :valid? way.add_nd_num(node_c.id) - assert way.valid? + assert_predicate way, :valid? end def test_from_xml_no_id noid = "" assert_nothing_raised do - Way.from_xml(noid, true) + Way.from_xml(noid, :create => true) end message = assert_raise(OSM::APIBadXMLError) do - Way.from_xml(noid, false) + Way.from_xml(noid, :create => 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_changeset_id nocs = "" message_create = assert_raise(OSM::APIBadXMLError) do - Way.from_xml(nocs, true) + Way.from_xml(nocs, :create => 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 - Way.from_xml(nocs, false) + Way.from_xml(nocs, :create => 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 = "" assert_nothing_raised do - Way.from_xml(no_version, true) + Way.from_xml(no_version, :create => true) end message_update = assert_raise(OSM::APIBadXMLError) do - Way.from_xml(no_version, false) + Way.from_xml(no_version, :create => 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_id_zero @@ -79,59 +78,59 @@ class WayTest < ActiveSupport::TestCase id_list.each do |id| zero_id = "" assert_nothing_raised do - Way.from_xml(zero_id, true) + Way.from_xml(zero_id, :create => true) end message_update = assert_raise(OSM::APIBadUserInput) do - Way.from_xml(zero_id, false) + Way.from_xml(zero_id, :create => false) end - assert_match /ID of way cannot be zero when updating/, message_update.message + assert_match(/ID of way cannot be zero when updating/, message_update.message) end end def test_from_xml_no_text no_text = "" message_create = assert_raise(OSM::APIBadXMLError) do - Way.from_xml(no_text, true) + Way.from_xml(no_text, :create => 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 - Way.from_xml(no_text, false) + Way.from_xml(no_text, :create => 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_k_v nokv = "" message_create = assert_raise(OSM::APIBadXMLError) do - Way.from_xml(nokv, true) + Way.from_xml(nokv, :create => 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 - Way.from_xml(nokv, false) + Way.from_xml(nokv, :create => 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 no_v = "" message_create = assert_raise(OSM::APIBadXMLError) do - Way.from_xml(no_v, true) + Way.from_xml(no_v, :create => 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 - Way.from_xml(no_v, false) + Way.from_xml(no_v, :create => 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 dupk = "" message_create = assert_raise(OSM::APIDuplicateTagsError) do - Way.from_xml(dupk, true) + Way.from_xml(dupk, :create => true) end assert_equal "Element way/ has duplicate tags with key dup", message_create.message message_update = assert_raise(OSM::APIDuplicateTagsError) do - Way.from_xml(dupk, false) + Way.from_xml(dupk, :create => false) end assert_equal "Element way/23 has duplicate tags with key dup", message_update.message end @@ -218,4 +217,86 @@ class WayTest < ActiveSupport::TestCase assert_equal 1, cr.size assert_equal relation.id, cr.first.id end + + test "raises missing changeset exception when creating" do + user = create(:user) + way = Way.new + assert_raises OSM::APIChangesetMissingError do + way.create_with_history(user) + end + end + + test "raises user-changeset mismatch exception when creating" do + user = create(:user) + changeset = create(:changeset) + way = Way.new(:changeset => changeset) + assert_raises OSM::APIUserChangesetMismatchError do + way.create_with_history(user) + end + end + + test "raises already closed changeset exception when creating" do + user = create(:user) + changeset = create(:changeset, :closed, :user => user) + way = Way.new(:changeset => changeset) + assert_raises OSM::APIChangesetAlreadyClosedError do + way.create_with_history(user) + end + end + + test "raises id precondition exception when updating" do + user = create(:user) + way = Way.new(:id => 23) + new_way = Way.new(:id => 42) + assert_raises OSM::APIPreconditionFailedError do + way.update_from(new_way, user) + end + end + + test "raises version mismatch exception when updating" do + user = create(:user) + way = Way.new(:id => 42, :version => 7) + new_way = Way.new(:id => 42, :version => 12) + assert_raises OSM::APIVersionMismatchError do + way.update_from(new_way, user) + end + end + + test "raises missing changeset exception when updating" do + user = create(:user) + way = Way.new(:id => 42, :version => 12) + new_way = Way.new(:id => 42, :version => 12) + assert_raises OSM::APIChangesetMissingError do + way.update_from(new_way, user) + end + end + + test "raises user-changeset mismatch exception when updating" do + user = create(:user) + changeset = create(:changeset) + way = Way.new(:id => 42, :version => 12) + new_way = Way.new(:id => 42, :version => 12, :changeset => changeset) + assert_raises OSM::APIUserChangesetMismatchError do + way.update_from(new_way, user) + end + end + + test "raises already closed changeset exception when updating" do + user = create(:user) + changeset = create(:changeset, :closed, :user => user) + way = Way.new(:id => 42, :version => 12) + new_way = Way.new(:id => 42, :version => 12, :changeset => changeset) + assert_raises OSM::APIChangesetAlreadyClosedError do + way.update_from(new_way, user) + end + end + + test "raises id precondition exception when deleting" do + user = create(:user) + way = Way.new(:id => 23, :visible => true) + new_way = Way.new(:id => 42, :visible => false) + assert_raises OSM::APIPreconditionFailedError do + way.delete_with_history!(new_way, user) + end + end end