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

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

Browse source
This commit is contained in:
Andy Allan 2017-04-25 15:19:25 +02:00
parent 6ce310b38c
commit 27c3edae25
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_relation.rb Normal file
View file

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

44
test/models/old_relation_test.rb
View file

@ -3,32 +3,28 @@ require "test_helper"
class OldRelationTest < ActiveSupport::TestCase class OldRelationTest < ActiveSupport::TestCase
api_fixtures api_fixtures
def test_db_count
assert_equal 14, OldRelation.count
end
def test_relation_tags def test_relation_tags
taglist_v3 = create_list(:old_relation_tag, 3, :old_relation => relations(:relation_with_versions_v3)) old_relation_v1 = create(:old_relation, :version => 1)
taglist_v4 = create_list(:old_relation_tag, 2, :old_relation => relations(:relation_with_versions_v4)) old_relation_v2 = create(:old_relation, :current_relation => old_relation_v1.current_relation, :version => 2)
old_relation_v3 = create(:old_relation, :current_relation => old_relation_v1.current_relation, :version => 3)
old_relation_v4 = create(:old_relation, :current_relation => old_relation_v1.current_relation, :version => 4)
taglist_v3 = create_list(:old_relation_tag, 3, :old_relation => old_relation_v3)
taglist_v4 = create_list(:old_relation_tag, 2, :old_relation => old_relation_v4)
relation = relations(:relation_with_versions_v1) tags = OldRelation.find(old_relation_v1.id).old_tags.order(:k)
tags = OldRelation.find(relation.id).old_tags.order(:k)
assert_equal 0, tags.count assert_equal 0, tags.count
relation = relations(:relation_with_versions_v2) tags = OldRelation.find(old_relation_v2.id).old_tags.order(:k)
tags = OldRelation.find(relation.id).old_tags.order(:k)
assert_equal 0, tags.count assert_equal 0, tags.count
relation = relations(:relation_with_versions_v3) tags = OldRelation.find(old_relation_v3.id).old_tags.order(:k)
tags = OldRelation.find(relation.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
relation = relations(:relation_with_versions_v4) tags = OldRelation.find(old_relation_v4.id).old_tags.order(:k)
tags = OldRelation.find(relation.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
@ -101,26 +97,26 @@ class OldRelationTest < ActiveSupport::TestCase
end end
def test_tags def test_tags
taglist_v3 = create_list(:old_relation_tag, 3, :old_relation => relations(:relation_with_versions_v3)) old_relation_v1 = create(:old_relation, :version => 1)
taglist_v4 = create_list(:old_relation_tag, 2, :old_relation => relations(:relation_with_versions_v4)) old_relation_v2 = create(:old_relation, :current_relation => old_relation_v1.current_relation, :version => 2)
old_relation_v3 = create(:old_relation, :current_relation => old_relation_v1.current_relation, :version => 3)
old_relation_v4 = create(:old_relation, :current_relation => old_relation_v1.current_relation, :version => 4)
taglist_v3 = create_list(:old_relation_tag, 3, :old_relation => old_relation_v3)
taglist_v4 = create_list(:old_relation_tag, 2, :old_relation => old_relation_v4)
relation = relations(:relation_with_versions_v1) tags = OldRelation.find(old_relation_v1.id).tags
tags = OldRelation.find(relation.id).tags
assert_equal 0, tags.size assert_equal 0, tags.size
relation = relations(:relation_with_versions_v2) tags = OldRelation.find(old_relation_v2.id).tags
tags = OldRelation.find(relation.id).tags
assert_equal 0, tags.size assert_equal 0, tags.size
relation = relations(:relation_with_versions_v3) tags = OldRelation.find(old_relation_v3.id).tags
tags = OldRelation.find(relation.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
relation = relations(:relation_with_versions_v4) tags = OldRelation.find(old_relation_v4.id).tags
tags = OldRelation.find(relation.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]