[ARVADOS] updated: cf670551c6832408f3f24cfad892cbfdd94d913a
git at public.curoverse.com
git at public.curoverse.com
Wed Jan 7 16:02:30 EST 2015
Summary of changes:
.../api/test/integration/collections_api_test.rb | 79 +++++++++++++---------
1 file changed, 46 insertions(+), 33 deletions(-)
via cf670551c6832408f3f24cfad892cbfdd94d913a (commit)
from 874f973f3af6b5dee65bfa3c55658430dadb5451 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit cf670551c6832408f3f24cfad892cbfdd94d913a
Author: Radhika Chippada <radhika at curoverse.com>
Date: Wed Jan 7 15:42:41 2015 -0500
4523: some more test assertions
diff --git a/services/api/test/integration/collections_api_test.rb b/services/api/test/integration/collections_api_test.rb
index 40b19fe..8d3ea7e 100644
--- a/services/api/test/integration/collections_api_test.rb
+++ b/services/api/test/integration/collections_api_test.rb
@@ -134,62 +134,75 @@ class CollectionsApiTest < ActionDispatch::IntegrationTest
end
test "create collection, verify file_names not returned, and search with filename" do
+ def search_using_file_name name, expected_items, desc, pdh
+ get '/arvados/v1/collections', {
+ where: { any: ['contains', name] }
+ }, auth(:active)
+ assert_response :success
+ response_items = json_response['items']
+ assert_not_nil response_items
+ if expected_items == 0
+ assert_equal 0, json_response['items_available']
+ assert_equal 0, response_items.size
+ else
+ assert_equal expected_items, response_items.size
+ first_item = response_items.first
+ assert_not_nil first_item
+ assert_equal desc, first_item['description']
+ assert_equal pdh, first_item['portable_data_hash']
+ assert_nil first_item['file_names']
+ end
+ end
+
signing_opts = {
key: Rails.configuration.blob_signing_key,
api_token: api_token(:active),
}
signed_locator = Blob.sign_locator('bad42fa702ae3ea7d999fef11b46f450+44', signing_opts)
+ # create collection
post "/arvados/v1/collections", {
format: :json,
collection: "{\"manifest_text\":\". #{signed_locator} 0:44:my_test_file.txt\\n\"}"
}, auth(:active)
- assert_response 200
+ assert_response :success
+ assert_equal true, json_response['manifest_text'].include?('my_test_file.txt')
assert_equal '0f99f4087beb13dec46d36db9fa6cebf+60', json_response['portable_data_hash']
assert_nil json_response['description']
assert_nil json_response['file_names']
- put "/arvados/v1/collections/#{json_response['uuid']}", {
+ created = json_response
+
+ # search using the filename
+ search_using_file_name 'my_test_file.txt', 1, nil, '0f99f4087beb13dec46d36db9fa6cebf+60'
+
+ # update collection's desc
+ put "/arvados/v1/collections/#{created['uuid']}", {
format: :json,
collection: { description: "my test collection description" }
}, auth(:active)
assert_response :success
+ assert_equal created['uuid'], json_response['uuid']
+ assert_equal true, json_response['manifest_text'].include?('my_test_file.txt')
assert_equal 'my test collection description', json_response['description']
assert_equal '0f99f4087beb13dec46d36db9fa6cebf+60', json_response['portable_data_hash']
assert_nil json_response['file_names']
- get '/arvados/v1/collections', {
- where: { any: ['contains', '87beb13dec46d36db9fa'] }
- }, auth(:active)
- assert_response :success
- response_items = json_response['items']
- assert_not_nil response_items
- first_item = json_response['items'].first
- assert_not_nil first_item
- assert_equal 'my test collection description', first_item['description']
- assert_equal '0f99f4087beb13dec46d36db9fa6cebf+60', first_item['portable_data_hash']
- assert_nil first_item['file_names']
-
- get '/arvados/v1/collections', {
- where: { any: ['contains', 'my_test_file.txt'] }
- }, auth(:active)
- assert_response :success
- response_items = json_response['items']
- assert_not_nil response_items
- assert_equal 1, response_items.size
- first_item = response_items.first
- assert_not_nil first_item
- assert_equal 'my test collection description', first_item['description']
- assert_equal '0f99f4087beb13dec46d36db9fa6cebf+60', first_item['portable_data_hash']
- assert_nil first_item['file_names']
-
- get '/arvados/v1/collections', {
- where: { any: ['contains', 'there_is_no_such_file.txt'] }
+ # update the collection's manifest text
+ put "/arvados/v1/collections/#{json_response['uuid']}", {
+ format: :json,
+ collection: "{\"manifest_text\":\". #{signed_locator} 0:44:my_updated_test_file.txt\\n\"}"
}, auth(:active)
assert_response :success
- assert_equal 0, json_response['items_available']
- response_items = json_response['items']
- assert_not_nil response_items
- assert_equal 0, response_items.size
+ assert_equal created['uuid'], json_response['uuid']
+ assert_equal true, json_response['manifest_text'].include?('my_updated_test_file.txt')
+ assert_equal false, json_response['manifest_text'].include?('my_test_file.txt')
+ assert_equal 'my test collection description', json_response['description']
+ assert_equal '17d7d7e6f09ae17e3b580143586a1a3f+68', json_response['portable_data_hash']
+ assert_nil json_response['file_names']
+
+ search_using_file_name 'my_updated_test_file.txt', 1, 'my test collection description', '17d7d7e6f09ae17e3b580143586a1a3f+68'
+ search_using_file_name 'my_test_file.txt', 0, nil, nil
+ search_using_file_name 'there_is_no_such_file.txt', 0, nil, nil
end
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list