cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Create an old_way factory, and start using it for tests.

Browse source
This commit is contained in:
Andy Allan 2017-04-25 15:53:52 +02:00
parent b46028b4f7
commit 05a42281ab
2 changed files with 30 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

10
test/factories/old_way.rb Normal file
View file

@ -0,0 +1,10 @@
FactoryGirl.define do
factory :old_way do
timestamp Time.now
visible true
version 1
changeset
association :current_way, :factory => :way
end
end

44
test/models/old_way_test.rb
View file

@ -3,10 +3,6 @@ require "test_helper"
class OldWayTest < ActiveSupport::TestCase class OldWayTest < ActiveSupport::TestCase
api_fixtures api_fixtures
def test_db_count
assert_equal 14, OldWay.count
end
def test_old_nodes def test_old_nodes
way = ways(:way_with_multiple_nodes_v1) way = ways(:way_with_multiple_nodes_v1)
nodes = OldWay.find(way.id).old_nodes.order(:sequence_id) nodes = OldWay.find(way.id).old_nodes.order(:sequence_id)
@ -38,27 +34,27 @@ class OldWayTest < ActiveSupport::TestCase
end end
def test_way_tags def test_way_tags
taglist_v3 = create_list(:old_way_tag, 3, :old_way => ways(:way_with_versions_v3)) old_way_v1 = create(:old_way, :version => 1)
taglist_v4 = create_list(:old_way_tag, 2, :old_way => ways(:way_with_versions_v4)) old_way_v2 = create(:old_way, :current_way => old_way_v1.current_way, :version => 2)
old_way_v3 = create(:old_way, :current_way => old_way_v1.current_way, :version => 3)
old_way_v4 = create(:old_way, :current_way => old_way_v1.current_way, :version => 4)
taglist_v3 = create_list(:old_way_tag, 3, :old_way => old_way_v3)
taglist_v4 = create_list(:old_way_tag, 2, :old_way => old_way_v4)
way = ways(:way_with_versions_v1) tags = OldWay.find(old_way_v1.id).old_tags.order(:k)
tags = OldWay.find(way.id).old_tags.order(:k)
assert_equal 0, tags.count assert_equal 0, tags.count
way = ways(:way_with_versions_v2) tags = OldWay.find(old_way_v2.id).old_tags.order(:k)
tags = OldWay.find(way.id).old_tags.order(:k)
assert_equal 0, tags.count assert_equal 0, tags.count
way = ways(:way_with_versions_v3) tags = OldWay.find(old_way_v3.id).old_tags.order(:k)
tags = OldWay.find(way.id).old_tags.order(:k)
assert_equal taglist_v3.count, tags.count assert_equal taglist_v3.count, tags.count
taglist_v3.sort_by!(&:k).each_index do |i| taglist_v3.sort_by!(&:k).each_index do |i|
assert_equal taglist_v3[i].k, tags[i].k assert_equal taglist_v3[i].k, tags[i].k
assert_equal taglist_v3[i].v, tags[i].v assert_equal taglist_v3[i].v, tags[i].v
end end
way = ways(:way_with_versions_v4) tags = OldWay.find(old_way_v4.id).old_tags.order(:k)
tags = OldWay.find(way.id).old_tags.order(:k)
assert_equal taglist_v4.count, tags.count assert_equal taglist_v4.count, tags.count
taglist_v4.sort_by!(&:k).each_index do |i| taglist_v4.sort_by!(&:k).each_index do |i|
assert_equal taglist_v4[i].k, tags[i].k assert_equal taglist_v4[i].k, tags[i].k
@ -67,26 +63,26 @@ class OldWayTest < ActiveSupport::TestCase
end end
def test_tags def test_tags
taglist_v3 = create_list(:old_way_tag, 3, :old_way => ways(:way_with_versions_v3)) old_way_v1 = create(:old_way, :version => 1)
taglist_v4 = create_list(:old_way_tag, 2, :old_way => ways(:way_with_versions_v4)) old_way_v2 = create(:old_way, :current_way => old_way_v1.current_way, :version => 2)
old_way_v3 = create(:old_way, :current_way => old_way_v1.current_way, :version => 3)
old_way_v4 = create(:old_way, :current_way => old_way_v1.current_way, :version => 4)
taglist_v3 = create_list(:old_way_tag, 3, :old_way => old_way_v3)
taglist_v4 = create_list(:old_way_tag, 2, :old_way => old_way_v4)
way = ways(:way_with_versions_v1) tags = OldWay.find(old_way_v1.id).tags
tags = OldWay.find(way.id).tags
assert_equal 0, tags.size assert_equal 0, tags.size
way = ways(:way_with_versions_v2) tags = OldWay.find(old_way_v2.id).tags
tags = OldWay.find(way.id).tags
assert_equal 0, tags.size assert_equal 0, tags.size
way = ways(:way_with_versions_v3) tags = OldWay.find(old_way_v3.id).tags
tags = OldWay.find(way.id).tags
assert_equal taglist_v3.count, tags.count assert_equal taglist_v3.count, tags.count
taglist_v3.each do |tag| taglist_v3.each do |tag|
assert_equal tag.v, tags[tag.k] assert_equal tag.v, tags[tag.k]
end end
way = ways(:way_with_versions_v4) tags = OldWay.find(old_way_v4.id).tags
tags = OldWay.find(way.id).tags
assert_equal taglist_v4.count, tags.count assert_equal taglist_v4.count, tags.count
taglist_v4.each do |tag| taglist_v4.each do |tag|
assert_equal tag.v, tags[tag.k] assert_equal tag.v, tags[tag.k]