segment stuff removed
This commit is contained in:
Frederik Ramm
parent
270902bc8e
commit
02451061ce
18 changed files with 0 additions and 635 deletions
27
test/fixtures/current_segments.yml
vendored
27
test/fixtures/current_segments.yml
vendored
|
|
@ -1,27 +0,0 @@
|
|||
# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
|
||||
visible_segment:
|
||||
id: 1
|
||||
node_a: 3
|
||||
node_b: 4
|
||||
user_id: 1
|
||||
visible: 1
|
||||
tags: test=yes
|
||||
timestamp: 2007-01-01 00:00:00
|
||||
|
||||
invisible_segment:
|
||||
id: 2
|
||||
node_a: 3
|
||||
node_b: 4
|
||||
user_id: 1
|
||||
visible: 0
|
||||
tags: test=yes
|
||||
timestamp: 2007-01-01 00:00:00
|
||||
|
||||
used_segment:
|
||||
id: 3
|
||||
node_a: 3
|
||||
node_b: 4
|
||||
user_id: 1
|
||||
visible: 1
|
||||
tags: test=yes
|
||||
timestamp: 2007-01-01 00:00:00
|
||||
9
test/fixtures/current_way_segments.yml
vendored
9
test/fixtures/current_way_segments.yml
vendored
|
|
@ -1,9 +0,0 @@
|
|||
t1:
|
||||
id: 1
|
||||
segment_id: 3
|
||||
sequence_id: 1
|
||||
|
||||
t2:
|
||||
id: 2
|
||||
segment_id: 3
|
||||
sequence_id: 1
|
||||
27
test/fixtures/segments.yml
vendored
27
test/fixtures/segments.yml
vendored
|
|
@ -1,27 +0,0 @@
|
|||
# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
|
||||
visible_segment:
|
||||
id: 1
|
||||
node_a: 3
|
||||
node_b: 4
|
||||
user_id: 1
|
||||
visible: 1
|
||||
tags: test=yes
|
||||
timestamp: 2007-01-01 00:00:00
|
||||
|
||||
invisible_segment:
|
||||
id: 2
|
||||
node_a: 3
|
||||
node_b: 4
|
||||
user_id: 1
|
||||
visible: 0
|
||||
tags: test=yes
|
||||
timestamp: 2007-01-01 00:00:00
|
||||
|
||||
used_segment:
|
||||
id: 3
|
||||
node_a: 3
|
||||
node_b: 4
|
||||
user_id: 1
|
||||
visible: 1
|
||||
tags: test=yes
|
||||
timestamp: 2007-01-01 00:00:00
|
||||
11
test/fixtures/way_segments.yml
vendored
11
test/fixtures/way_segments.yml
vendored
|
|
@ -1,11 +0,0 @@
|
|||
t1:
|
||||
id: 1
|
||||
segment_id: 3
|
||||
sequence_id: 1
|
||||
version: 1
|
||||
|
||||
t2:
|
||||
id: 2
|
||||
segment_id: 3
|
||||
sequence_id: 1
|
||||
version: 1
|
||||
|
|
@ -1,98 +0,0 @@
|
|||
require File.dirname(__FILE__) + '/../test_helper'
|
||||
require 'segment_controller'
|
||||
|
||||
# Re-raise errors caught by the controller.
|
||||
class SegmentController; def rescue_action(e) raise e end; end
|
||||
|
||||
class SegmentControllerTest < Test::Unit::TestCase
|
||||
api_fixtures
|
||||
|
||||
def setup
|
||||
@controller = SegmentController.new
|
||||
@request = ActionController::TestRequest.new
|
||||
@response = ActionController::TestResponse.new
|
||||
end
|
||||
|
||||
def test_create
|
||||
# cannot read password from fixture as it is stored as MD5 digest
|
||||
basic_authorization("test@openstreetmap.org", "test");
|
||||
na = current_nodes(:used_node_1).id
|
||||
nb = current_nodes(:used_node_2).id
|
||||
content("<osm><segment from='#{na}' to='#{nb}' /></osm>")
|
||||
put :create
|
||||
# hope for success
|
||||
assert_response :success, "segment upload did not return success status"
|
||||
# read id of created segment and search for it
|
||||
segmentid = @response.body
|
||||
checksegment = Segment.find(segmentid)
|
||||
assert_not_nil checksegment, "uploaded segment not found in data base after upload"
|
||||
# compare values
|
||||
assert_equal na, checksegment.node_a, "saved segment does not match requested from-node"
|
||||
assert_equal nb, checksegment.node_b, "saved segment does not match requested to-node"
|
||||
assert_equal users(:normal_user).id, checksegment.user_id, "saved segment does not belong to user that created it"
|
||||
assert_equal true, checksegment.visible, "saved segment is not visible"
|
||||
end
|
||||
|
||||
def test_create_invalid
|
||||
basic_authorization("test@openstreetmap.org", "test");
|
||||
# create a segment with one invalid node
|
||||
na = current_nodes(:used_node_1).id
|
||||
nb = 0
|
||||
content("<osm><segment from='#{na}' to='#{nb}' /></osm>")
|
||||
put :create
|
||||
# expect failure
|
||||
assert_response :precondition_failed, "upload of invalid segment did not return 'precondition failed'"
|
||||
end
|
||||
|
||||
def test_read
|
||||
# check that a visible segment is returned properly
|
||||
get :read, :id => current_segments(:visible_segment).id
|
||||
assert_response :success
|
||||
# TODO: check for <segment> tag in return data
|
||||
|
||||
# check that an invisible segment is not returned
|
||||
get :read, :id => current_segments(:invisible_segment).id
|
||||
assert_response :gone
|
||||
|
||||
# check chat a non-existent segment is not returned
|
||||
get :read, :id => 0
|
||||
assert_response :not_found
|
||||
end
|
||||
|
||||
# this tests deletion restrictions - basic deletion is tested in the unit
|
||||
# tests for segment!
|
||||
def test_delete
|
||||
|
||||
# first try to delete segment without auth
|
||||
delete :delete, :id => current_segments(:visible_segment).id
|
||||
assert_response :unauthorized
|
||||
|
||||
# now set auth
|
||||
basic_authorization("test@openstreetmap.org", "test");
|
||||
|
||||
# this should work
|
||||
delete :delete, :id => current_segments(:visible_segment).id
|
||||
assert_response :success
|
||||
|
||||
# this won't work since the segment is already deleted
|
||||
delete :delete, :id => current_segments(:invisible_segment).id
|
||||
assert_response :gone
|
||||
|
||||
# this won't work since the segment never existed
|
||||
delete :delete, :id => 0
|
||||
assert_response :not_found
|
||||
|
||||
# this won't work since the segment is in use
|
||||
delete :delete, :id => current_segments(:used_segment).id
|
||||
assert_response :precondition_failed
|
||||
end
|
||||
|
||||
|
||||
def basic_authorization(user, pass)
|
||||
@request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}")
|
||||
end
|
||||
|
||||
def content(c)
|
||||
@request.env["RAW_POST_DATA"] = c
|
||||
end
|
||||
end
|
||||
|
|
@ -1,104 +0,0 @@
|
|||
require File.dirname(__FILE__) + '/../test_helper'
|
||||
|
||||
class SegmentTest < Test::Unit::TestCase
|
||||
fixtures :current_nodes, :nodes, :current_segments, :segments, :users
|
||||
set_fixture_class :current_segments => :Segment
|
||||
set_fixture_class :segments => :OldSegment
|
||||
set_fixture_class :current_nodes => :Node
|
||||
set_fixture_class :nodes => :OldNode
|
||||
|
||||
def test_create
|
||||
|
||||
segment_template = Segment.new(:node_a => nodes(:used_node_1).id,
|
||||
:node_b => nodes(:used_node_2).id,
|
||||
:user_id => users(:normal_user).id,
|
||||
:visible => 1,
|
||||
:tags => "")
|
||||
assert segment_template.save_with_history
|
||||
|
||||
segment = Segment.find(segment_template.id)
|
||||
assert_not_nil segment
|
||||
assert_equal segment_template.node_a, segment.node_a
|
||||
assert_equal segment_template.node_b, segment.node_b
|
||||
assert_equal segment_template.user_id, segment.user_id
|
||||
assert_equal segment_template.visible, segment.visible
|
||||
assert_equal segment_template.tags, segment.tags
|
||||
assert_equal segment_template.timestamp.to_i, segment.timestamp.to_i
|
||||
|
||||
assert_equal OldSegment.find(:all, :conditions => [ "id = ?", segment_template.id ]).length, 1
|
||||
old_segment = OldSegment.find(:first, :conditions => [ "id = ?", segment_template.id ])
|
||||
assert_not_nil old_segment
|
||||
assert_equal segment_template.node_a, old_segment.node_a
|
||||
assert_equal segment_template.node_b, old_segment.node_b
|
||||
assert_equal segment_template.user_id, old_segment.user_id
|
||||
assert_equal segment_template.visible, old_segment.visible
|
||||
assert_equal segment_template.tags, old_segment.tags
|
||||
assert_equal segment_template.timestamp.to_i, old_segment.timestamp.to_i
|
||||
end
|
||||
|
||||
def test_update
|
||||
segment_template = Segment.find(1)
|
||||
assert_not_nil segment_template
|
||||
|
||||
assert_equal OldSegment.find(:all, :conditions => [ "id = ?", segment_template.id ]).length, 1
|
||||
old_segment_template = OldSegment.find(:first, :conditions => [ "id = ?", segment_template.id ])
|
||||
assert_not_nil old_segment_template
|
||||
|
||||
segment_template.node_a = nodes(:used_node_2).id
|
||||
segment_template.node_b = nodes(:used_node_1).id
|
||||
segment_template.tags = "updated=yes"
|
||||
assert segment_template.save_with_history
|
||||
|
||||
segment = Segment.find(segment_template.id)
|
||||
assert_not_nil segment
|
||||
assert_equal segment_template.node_a, segment.node_a
|
||||
assert_equal segment_template.node_b, segment.node_b
|
||||
assert_equal segment_template.user_id, segment.user_id
|
||||
assert_equal segment_template.visible, segment.visible
|
||||
assert_equal segment_template.tags, segment.tags
|
||||
assert_equal segment_template.timestamp.to_i, segment.timestamp.to_i
|
||||
|
||||
assert_equal OldSegment.find(:all, :conditions => [ "id = ?", segment_template.id ]).length, 2
|
||||
assert_equal OldSegment.find(:all, :conditions => [ "id = ? and timestamp = ?", segment_template.id, segment_template.timestamp ]).length, 1
|
||||
old_segment = OldSegment.find(:first, :conditions => [ "id = ? and timestamp = ?", segment_template.id, segment_template.timestamp ])
|
||||
assert_not_nil old_segment
|
||||
assert_equal segment_template.node_a, old_segment.node_a
|
||||
assert_equal segment_template.node_b, old_segment.node_b
|
||||
assert_equal segment_template.user_id, old_segment.user_id
|
||||
assert_equal segment_template.visible, old_segment.visible
|
||||
assert_equal segment_template.tags, old_segment.tags
|
||||
assert_equal segment_template.timestamp.to_i, old_segment.timestamp.to_i
|
||||
end
|
||||
|
||||
def test_delete
|
||||
segment_template = Segment.find(1)
|
||||
assert_not_nil segment_template
|
||||
|
||||
assert_equal OldSegment.find(:all, :conditions => [ "id = ?", segment_template.id ]).length, 1
|
||||
old_segment_template = OldSegment.find(:first, :conditions => [ "id = ?", segment_template.id ])
|
||||
assert_not_nil old_segment_template
|
||||
|
||||
segment_template.visible = 0
|
||||
assert segment_template.save_with_history
|
||||
|
||||
segment = Segment.find(segment_template.id)
|
||||
assert_not_nil segment
|
||||
assert_equal segment_template.node_a, segment.node_a
|
||||
assert_equal segment_template.node_b, segment.node_b
|
||||
assert_equal segment_template.user_id, segment.user_id
|
||||
assert_equal segment_template.visible, segment.visible
|
||||
assert_equal segment_template.tags, segment.tags
|
||||
assert_equal segment_template.timestamp.to_i, segment.timestamp.to_i
|
||||
|
||||
assert_equal OldSegment.find(:all, :conditions => [ "id = ?", segment_template.id ]).length, 2
|
||||
assert_equal OldSegment.find(:all, :conditions => [ "id = ? and timestamp = ?", segment_template.id, segment_template.timestamp ]).length, 1
|
||||
old_segment = OldSegment.find(:first, :conditions => [ "id = ? and timestamp = ?", segment_template.id, segment_template.timestamp ])
|
||||
assert_not_nil old_segment
|
||||
assert_equal segment_template.node_a, old_segment.node_a
|
||||
assert_equal segment_template.node_b, old_segment.node_b
|
||||
assert_equal segment_template.user_id, old_segment.user_id
|
||||
assert_equal segment_template.visible, old_segment.visible
|
||||
assert_equal segment_template.tags, old_segment.tags
|
||||
assert_equal segment_template.timestamp.to_i, old_segment.timestamp.to_i
|
||||
end
|
||||
end
|
||||
Loading…
Add table
Add a link
Reference in a new issue