X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/43a28065b183af1d6015cf0bc890eb1960474b58..07df3f9809404084435fae270d95f1d45b5f3dd6:/test/unit/changeset_test.rb diff --git a/test/unit/changeset_test.rb b/test/unit/changeset_test.rb index 0f88fad7b..9533cd55e 100644 --- a/test/unit/changeset_test.rb +++ b/test/unit/changeset_test.rb @@ -2,25 +2,11 @@ require File.dirname(__FILE__) + '/../test_helper' class ChangesetTest < ActiveSupport::TestCase api_fixtures - + def test_changeset_count assert_equal 7, Changeset.count end - - def test_xml_from_id_zero - id_list = ["", "0", "00", "0.0", "a"] - id_list.each do |id| - zero_id = "" - assert_nothing_raised(OSM::APIBadUserInput) { - Changeset.from_xml(zero_id, true) - } - message_update = assert_raise(OSM::APIBadUserInput) { - Changeset.from_xml(zero_id, false) - } - assert_match /ID of changeset cannot be zero when updating/, message_update.message - end - end - + def test_from_xml_no_text no_text = "" message_create = assert_raise(OSM::APIBadXMLError) { @@ -32,7 +18,7 @@ class ChangesetTest < ActiveSupport::TestCase } assert_match /Must specify a string with one or more characters/, message_update.message end - + def test_from_xml_no_changeset nocs = "" message_create = assert_raise(OSM::APIBadXMLError) { @@ -44,7 +30,7 @@ class ChangesetTest < ActiveSupport::TestCase } assert_match /XML doesn't contain an osm\/changeset element/, message_update.message end - + def test_from_xml_no_k_v nokv = "" message_create = assert_raise(OSM::APIBadXMLError) { @@ -56,9 +42,9 @@ class ChangesetTest < ActiveSupport::TestCase } assert_match /tag is missing key/, message_create.message end - + def test_from_xml_no_v - no_v = "" + no_v = "" message_create = assert_raise(OSM::APIBadXMLError) { Changeset.from_xml(no_v, true) } @@ -68,9 +54,9 @@ class ChangesetTest < ActiveSupport::TestCase } assert_match /tag is missing value/, message_update.message end - + def test_from_xml_duplicate_k - dupk = "" + dupk = "" message_create = assert_raise(OSM::APIDuplicateTagsError) { Changeset.from_xml(dupk, true) } @@ -78,6 +64,17 @@ class ChangesetTest < ActiveSupport::TestCase message_update = assert_raise(OSM::APIDuplicateTagsError) { Changeset.from_xml(dupk, false) } - assert_equal "Element changeset/1 has duplicate tags with key dup", message_update.message + assert_equal "Element changeset/ has duplicate tags with key dup", message_update.message + end + + def test_from_xml_valid + # Example taken from the Update section on the API_v0.6 docs on the wiki + xml = "" + assert_nothing_raised(OSM::APIBadXMLError) { + Changeset.from_xml(xml, false) + } + assert_nothing_raised(OSM::APIBadXMLError) { + Changeset.from_xml(xml, true) + } end end