X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/dd6e25d53f9cf02f91b419584ff4c331e0618a24..f0ab1bd48f45470ffb6fefafa713c51347f5a194:/apps/workbench/test/functional/application_controller_test.rb

diff --git a/apps/workbench/test/functional/application_controller_test.rb b/apps/workbench/test/functional/application_controller_test.rb
index d4adc1c3fc..f3dbcb523b 100644
--- a/apps/workbench/test/functional/application_controller_test.rb
+++ b/apps/workbench/test/functional/application_controller_test.rb
@@ -21,18 +21,6 @@ class ApplicationControllerTest < ActionController::TestCase
     assert links[0][:uuid], 'Expected uuid for the head_link'
   end
 
-  test "links for no such object" do
-    use_token :active
-
-    ac = ApplicationController.new
-
-    links = ac.send :links_for_object, "no-such-uuid"
-
-    assert links, 'Expected links'
-    assert links.is_a?(Array), 'Expected an array'
-    assert links.size == 0, 'Expected no links'
-  end
-
   test "preload links for objects and uuids" do
     use_token :active
 
@@ -63,16 +51,26 @@ class ApplicationControllerTest < ActionController::TestCase
     assert links[link1_head_uuid], 'Expected links for the passed in link head_uuid'
   end
 
-  test "preload links for empty array input" do
-    use_token :active
+  [ [:preload_links_for_objects, [] ],
+    [:preload_collections_for_objects, [] ],
+    [:preload_log_collections_for_objects, [] ],
+    [:preload_objects_for_dataclass, [] ],
+  ].each do |input|
+    test "preload data for empty array input #{input}" do
+      use_token :active
 
-    ac = ApplicationController.new
+      ac = ApplicationController.new
 
-    links = ac.send :preload_links_for_objects, []
+      if input[0] == :preload_objects_for_dataclass
+        objects = ac.send input[0], @user_dataclass, input[1]
+      else
+        objects = ac.send input[0], input[1]
+      end
 
-    assert links, 'Expected links'
-    assert links.is_a?(Hash), 'Expected a hash'
-    assert links.size == 0, 'Expected no objects in the preloaded links hash'
+      assert objects, 'Expected objects'
+      assert objects.is_a?(Hash), 'Expected a hash'
+      assert objects.size == 0, 'Expected no objects in the preloaded hash'
+    end
   end
 
   [ [:preload_links_for_objects, 'input not an array'],
@@ -85,7 +83,7 @@ class ApplicationControllerTest < ActionController::TestCase
     [:preload_log_collections_for_objects, nil],
     [:log_collections_for_object, nil],
     [:preload_objects_for_dataclass, 'input not an array'],
-    [:preload_objects_for_dataclass, nil],    
+    [:preload_objects_for_dataclass, nil],
     [:object_for_dataclass, 'some_dataclass', nil],
     [:object_for_dataclass, nil, 'some_uuid'],
   ].each do |input|
@@ -106,6 +104,27 @@ class ApplicationControllerTest < ActionController::TestCase
     end
   end
 
+  [ [:links_for_object, 'no-such-uuid' ],
+    [:collections_for_object, 'no-such-uuid' ],
+    [:log_collections_for_object, 'no-such-uuid' ],
+    [:object_for_dataclass, 'no-such-uuid' ],
+  ].each do |input|
+    test "get data for no such uuid #{input}" do
+      use_token :active
+
+      ac = ApplicationController.new
+
+      if input[0] == :object_for_dataclass
+        object = ac.send input[0], @user_dataclass, input[1]
+        assert_not object, 'Expected no object'
+      else
+        objects = ac.send input[0], input[1]
+        assert objects, 'Expected objects'
+        assert objects.is_a?(Array), 'Expected a array'
+      end
+    end
+  end
+
   test "get 10 objects of data class user" do
     use_token :active
 
@@ -157,28 +176,58 @@ class ApplicationControllerTest < ActionController::TestCase
     assert_equal collections[0][:uuid], uuid, 'Expected uuid not found in collections'
   end
 
-  test "collections for no such object" do
+  test "preload collections for given uuids" do
+    use_token :active
+
+    ac = ApplicationController.new
+
+    uuid1 = api_fixture('collections')['foo_file']['uuid']
+    uuid2 = api_fixture('collections')['bar_file']['uuid']
+
+    uuids = [uuid1, uuid2]
+    collections = ac.send :preload_collections_for_objects, uuids
+
+    assert collections, 'Expected collection'
+    assert collections.is_a?(Hash), 'Expected a hash'
+    assert collections.size == 2, 'Expected two objects in the preloaded collection hash'
+    assert collections[uuid1], 'Expected collections for the passed in uuid'
+    assert_equal collections[uuid1].size, 1, 'Expected one collection for the passed in uuid'
+    assert collections[uuid2], 'Expected collections for the passed in uuid'
+    assert_equal collections[uuid2].size, 1, 'Expected one collection for the passed in uuid'
+
+    # invoke again for this same input. this time, the preloaded data will be returned
+    collections = ac.send :preload_collections_for_objects, uuids
+    assert collections, 'Expected collection'
+    assert collections.is_a?(Hash), 'Expected a hash'
+    assert collections.size == 2, 'Expected two objects in the preloaded collection hash'
+    assert collections[uuid1], 'Expected collections for the passed in uuid'
+  end
+
+  test "log collections for object" do
     use_token :active
 
     ac = ApplicationController.new
 
-    collections = ac.send :collections_for_object, "no-such-uuid"
+    uuid = api_fixture('logs')['log4']['object_uuid']
+
+    collections = ac.send :log_collections_for_object, uuid
 
     assert collections, 'Expected collections'
     assert collections.is_a?(Array), 'Expected an array'
-    assert collections.size == 0, 'Expected no collections in response'
+    assert collections.size == 1, 'Expected one collection object'
+    assert_equal collections[0][:uuid], uuid, 'Expected uuid not found in collections'
   end
 
-  test "preload collections for given uuids" do
+  test "preload log collections for given uuids" do
     use_token :active
 
     ac = ApplicationController.new
 
-    uuid1 = api_fixture('collections')['foo_file']['uuid']
+    uuid1 = api_fixture('logs')['log4']['object_uuid']
     uuid2 = api_fixture('collections')['bar_file']['uuid']
 
     uuids = [uuid1, uuid2]
-    collections = ac.send :preload_collections_for_objects, uuids
+    collections = ac.send :preload_log_collections_for_objects, uuids
 
     assert collections, 'Expected collection'
     assert collections.is_a?(Hash), 'Expected a hash'
@@ -189,23 +238,62 @@ class ApplicationControllerTest < ActionController::TestCase
     assert_equal collections[uuid2].size, 1, 'Expected one collection for the passed in uuid'
 
     # invoke again for this same input. this time, the preloaded data will be returned
-    collections = ac.send :preload_collections_for_objects, uuids
+    collections = ac.send :preload_log_collections_for_objects, uuids
     assert collections, 'Expected collection'
     assert collections.is_a?(Hash), 'Expected a hash'
     assert collections.size == 2, 'Expected two objects in the preloaded collection hash'
     assert collections[uuid1], 'Expected collections for the passed in uuid'
   end
 
-  test "preload collections for empty array input" do
+  test "object for dataclass" do
     use_token :active
 
     ac = ApplicationController.new
 
-    collections = ac.send :preload_links_for_objects, []
+    dataclass = ArvadosBase.resource_class_for_uuid(api_fixture('jobs')['running']['uuid'])
+    uuid = api_fixture('jobs')['running']['uuid']
 
-    assert collections, 'Expected collections'
-    assert collections.is_a?(Hash), 'Expected a hash'
-    assert collections.size == 0, 'Expected no objects in the preloaded collections hash'
+    obj = ac.send :object_for_dataclass, dataclass, uuid
+
+    assert obj, 'Expected object'
+    assert 'Job', obj.class
+    assert_equal uuid, obj['uuid'], 'Expected uuid not found'
+    assert_equal api_fixture('jobs')['running']['script_version'], obj['script_version'],
+      'Expected script_version not found'
+  end
+
+  test "preload objects for dataclass" do
+    use_token :active
+
+    ac = ApplicationController.new
+
+    dataclass = ArvadosBase.resource_class_for_uuid(api_fixture('jobs')['running']['uuid'])
+
+    uuid1 = api_fixture('jobs')['running']['uuid']
+    uuid2 = api_fixture('jobs')['running_cancelled']['uuid']
+
+    uuids = [uuid1, uuid2]
+    users = ac.send :preload_objects_for_dataclass, dataclass, uuids
+
+    assert users, 'Expected objects'
+    assert users.is_a?(Hash), 'Expected a hash'
+
+    assert users.size == 2, 'Expected two objects in the preloaded hash'
+    assert users[uuid1], 'Expected user object for the passed in uuid'
+    assert users[uuid2], 'Expected user object for the passed in uuid'
+
+    # invoke again for this same input. this time, the preloaded data will be returned
+    users = ac.send :preload_objects_for_dataclass, dataclass, uuids
+    assert users, 'Expected objects'
+    assert users.is_a?(Hash), 'Expected a hash'
+    assert users.size == 2, 'Expected two objects in the preloaded hash'
+
+    # invoke again for this with one more uuid
+    uuids << api_fixture('jobs')['foobar']['uuid']
+    users = ac.send :preload_objects_for_dataclass, dataclass, uuids
+    assert users, 'Expected objects'
+    assert users.is_a?(Hash), 'Expected a hash'
+    assert users.size == 3, 'Expected two objects in the preloaded hash'
   end
 
 end