Reorganise tests to match modern rails test layout

[rails.git] / test / unit / way_test.rb

diff --git a/test/unit/way_test.rb b/test/unit/way_test.rb
deleted file mode 100644 (file)
index 39da76e..0000000
--- a/test/unit/way_test.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-class WayTest < ActiveSupport::TestCase
-  api_fixtures
-
-  # Check that we have the correct number of currnet ways in the db
-  # This will need to updated whenever the current_ways.yml is updated
-  def test_db_count
-    assert_equal 5, Way.count
-  end
-  
-  def test_bbox
-    node = current_nodes(:used_node_1)
-    [ :visible_way,
-      :invisible_way,
-      :used_way ].each do |way_symbol|
-      way = current_ways(way_symbol)
-      assert_equal node.bbox, way.bbox
-    end
-  end
-  
-  # Check that the preconditions fail when you are over the defined limit of 
-  # the maximum number of nodes in each way.
-  def test_max_nodes_per_way_limit
-    # Take one of the current ways and add nodes to it until we are near the limit
-    way = Way.find(current_ways(:visible_way).id)
-    assert way.valid?
-    # it already has 1 node
-    1.upto((APP_CONFIG['max_number_of_way_nodes']) / 2) {
-      way.add_nd_num(current_nodes(:used_node_1).id)
-      way.add_nd_num(current_nodes(:used_node_2).id)
-    }
-    way.save
-    #print way.nds.size
-    assert way.valid?
-    way.add_nd_num(current_nodes(:visible_node).id)
-    assert way.valid?
-  end
-  
-  def test_from_xml_no_id
-    noid = "<osm><way version='12' changeset='23' /></osm>"
-    assert_nothing_raised(OSM::APIBadXMLError) {
-      Way.from_xml(noid, true)
-    }
-    message = assert_raise(OSM::APIBadXMLError) {
-      Way.from_xml(noid, false)
-    }
-    assert_match /ID is required when updating/, message.message
-  end
-  
-  def test_from_xml_no_changeset_id
-    nocs = "<osm><way id='123' version='23' /></osm>"
-    message_create = assert_raise(OSM::APIBadXMLError) {
-      Way.from_xml(nocs, true)
-    }
-    assert_match /Changeset id is missing/, message_create.message
-    message_update = assert_raise(OSM::APIBadXMLError) {
-      Way.from_xml(nocs, false)
-    }
-    assert_match /Changeset id is missing/, message_update.message
-  end
-  
-  def test_from_xml_no_version
-    no_version = "<osm><way id='123' changeset='23' /></osm>"
-    assert_nothing_raised(OSM::APIBadXMLError) {
-      Way.from_xml(no_version, true)
-    }
-    message_update = assert_raise(OSM::APIBadXMLError) {
-      Way.from_xml(no_version, false)
-    }
-    assert_match /Version is required when updating/, 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><way id='#{id}' changeset='33' version='23' /></osm>"
-      assert_nothing_raised(OSM::APIBadUserInput) {
-        Way.from_xml(zero_id, true)
-      }
-      message_update = assert_raise(OSM::APIBadUserInput) {
-        Way.from_xml(zero_id, false)
-      }
-      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) {
-      Way.from_xml(no_text, true)
-    }
-    assert_match /Must specify a string with one or more characters/, message_create.message
-    message_update = assert_raise(OSM::APIBadXMLError) {
-      Way.from_xml(no_text, false)
-    }
-    assert_match /Must specify a string with one or more characters/, message_update.message
-  end
-  
-  def test_from_xml_no_k_v
-    nokv = "<osm><way id='23' changeset='23' version='23'><tag /></way></osm>"
-    message_create = assert_raise(OSM::APIBadXMLError) {
-      Way.from_xml(nokv, true)
-    }
-    assert_match /tag is missing key/, message_create.message
-    message_update = assert_raise(OSM::APIBadXMLError) {
-      Way.from_xml(nokv, false)
-    }
-    assert_match /tag is missing key/, message_update.message
-  end
-  
-  def test_from_xml_no_v
-    no_v = "<osm><way id='23' changeset='23' version='23'><tag k='key' /></way></osm>"
-    message_create = assert_raise(OSM::APIBadXMLError) {
-      Way.from_xml(no_v, true)
-    }
-    assert_match /tag is missing value/, message_create.message
-    message_update = assert_raise(OSM::APIBadXMLError) {
-      Way.from_xml(no_v, false)
-    }
-    assert_match /tag is missing value/, message_update.message
-  end
-  
-  def test_from_xml_duplicate_k
-    dupk = "<osm><way id='23' changeset='23' version='23'><tag k='dup' v='test' /><tag k='dup' v='tester' /></way></osm>"
-    message_create = assert_raise(OSM::APIDuplicateTagsError) {
-      Way.from_xml(dupk, true)
-    }
-    assert_equal "Element way/ has duplicate tags with key dup", message_create.message
-    message_update = assert_raise(OSM::APIDuplicateTagsError) {
-      Way.from_xml(dupk, false)
-    }
-    assert_equal "Element way/23 has duplicate tags with key dup", message_update.message
-  end
-end