From 1a3130ec61187636fe5b0aabece6a94ebf7bb476 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 22 Mar 2017 17:50:10 +0000 Subject: [PATCH] Create a node factory, and use it for most node model tests --- test/factories/node.rb | 13 ++++++ test/models/node_test.rb | 85 ++++++++++++++-------------------------- 2 files changed, 43 insertions(+), 55 deletions(-) create mode 100644 test/factories/node.rb diff --git a/test/factories/node.rb b/test/factories/node.rb new file mode 100644 index 000000000..697a5c1ae --- /dev/null +++ b/test/factories/node.rb @@ -0,0 +1,13 @@ +FactoryGirl.define do + factory :node do + latitude 1 * GeoRecord::SCALE + longitude 1 * GeoRecord::SCALE + + # FIXME: needs changeset factory + changeset_id 1 + + visible true + timestamp Time.now + version 1 + end +end diff --git a/test/models/node_test.rb b/test/models/node_test.rb index 85bdfc995..2afff3358 100644 --- a/test/models/node_test.rb +++ b/test/models/node_test.rb @@ -3,76 +3,49 @@ require "test_helper" class NodeTest < ActiveSupport::TestCase api_fixtures - def test_node_count - assert_equal 19, Node.count - end - def test_node_too_far_north - invalid_node_test(:node_too_far_north) + node = build(:node, :latitude => 90.01 * OldNode::SCALE) + assert_equal false, node.valid? end def test_node_north_limit - valid_node_test(:node_north_limit) + node = build(:node, :latitude => 90 * OldNode::SCALE) + assert node.valid? end def test_node_too_far_south - invalid_node_test(:node_too_far_south) + node = build(:node, :latitude => -90.01 * OldNode::SCALE) + assert_equal false, node.valid? end def test_node_south_limit - valid_node_test(:node_south_limit) + node = build(:node, :latitude => -90 * OldNode::SCALE) + assert node.valid? end def test_node_too_far_west - invalid_node_test(:node_too_far_west) + node = build(:node, :longitude => -180.01 * OldNode::SCALE) + assert_equal false, node.valid? end def test_node_west_limit - valid_node_test(:node_west_limit) + node = build(:node, :longitude => -180 * OldNode::SCALE) + assert node.valid? end def test_node_too_far_east - invalid_node_test(:node_too_far_east) + node = build(:node, :longitude => 180.01 * OldNode::SCALE) + assert_equal false, node.valid? end def test_node_east_limit - valid_node_test(:node_east_limit) - end - - def test_totally_wrong - invalid_node_test(:node_totally_wrong) - end - - # This helper method will check to make sure that a node is within the world, and - # has the the same lat, lon and timestamp than what was put into the db by - # the fixture - def valid_node_test(nod) - node = current_nodes(nod) - dbnode = Node.find(node.id) - assert_equal dbnode.lat, node.latitude.to_f / Node::SCALE - assert_equal dbnode.lon, node.longitude.to_f / Node::SCALE - assert_equal dbnode.changeset_id, node.changeset_id - assert_equal dbnode.timestamp, node.timestamp - assert_equal dbnode.version, node.version - assert_equal dbnode.visible, node.visible - # assert_equal node.tile, QuadTile.tile_for_point(node.lat, node.lon) + node = build(:node, :longitude => 180 * OldNode::SCALE) assert node.valid? end - # This helper method will check to make sure that a node is outwith the world, - # and has the same lat, lon and timesamp than what was put into the db by the - # fixture - def invalid_node_test(nod) - node = current_nodes(nod) - dbnode = Node.find(node.id) - assert_equal dbnode.lat, node.latitude.to_f / Node::SCALE - assert_equal dbnode.lon, node.longitude.to_f / Node::SCALE - assert_equal dbnode.changeset_id, node.changeset_id - assert_equal dbnode.timestamp, node.timestamp - assert_equal dbnode.version, node.version - assert_equal dbnode.visible, node.visible - # assert_equal node.tile, QuadTile.tile_for_point(node.lat, node.lon) - assert_equal false, dbnode.valid? + def test_totally_wrong + node = build(:node, :latitude => 200 * OldNode::SCALE, :longitude => 200 * OldNode::SCALE) + assert_equal false, node.valid? end # Check that you can create a node and store it @@ -106,17 +79,18 @@ class NodeTest < ActiveSupport::TestCase end def test_update - node_template = Node.find(current_nodes(:visible_node).id) - assert_not_nil node_template + node = create(:node) + create(:old_node, :node_id => node.id, :version => 1) + node_template = Node.find(node.id) + assert_not_nil node_template assert_equal OldNode.where(:node_id => node_template.id).count, 1 - node = Node.find(node_template.id) assert_not_nil node node_template.latitude = 12.3456 node_template.longitude = 65.4321 # node_template.tags = "updated=yes" - assert node.update_from(node_template, current_nodes(:visible_node).changeset.user) + assert node.update_from(node_template, node.changeset.user) node = Node.find(node_template.id) assert_not_nil node @@ -137,14 +111,15 @@ class NodeTest < ActiveSupport::TestCase end def test_delete - node_template = Node.find(current_nodes(:visible_node).id) - assert_not_nil node_template + node = create(:node) + create(:old_node, :node_id => node.id, :version => 1) + node_template = Node.find(node.id) + assert_not_nil node_template assert_equal OldNode.where(:node_id => node_template.id).count, 1 - node = Node.find(node_template.id) assert_not_nil node - assert node.delete_with_history!(node_template, current_nodes(:visible_node).changeset.user) + assert node.delete_with_history!(node_template, node.changeset.user) node = Node.find(node_template.id) assert_not_nil node @@ -315,7 +290,7 @@ class NodeTest < ActiveSupport::TestCase end def test_node_tags - node = current_nodes(:node_with_versions) + node = create(:node) taglist = create_list(:node_tag, 2, :node => node) tags = Node.find(node.id).node_tags.order(:k) assert_equal taglist.count, tags.count @@ -326,7 +301,7 @@ class NodeTest < ActiveSupport::TestCase end def test_tags - node = current_nodes(:node_with_versions) + node = create(:node) taglist = create_list(:node_tag, 2, :node => node) tags = Node.find(node.id).tags assert_equal taglist.count, tags.count -- 2.43.2