Merge branch 'master' into 4523-search-index

[arvados.git] / services / api / test / unit / collection_test.rb

diff --git a/services/api/test/unit/collection_test.rb b/services/api/test/unit/collection_test.rb
index ed257a745b4895fab557c20829128d177d2238ad..0134ec2864fd3da66419557c548fb911959c3770 100644 (file)
--- a/services/api/test/unit/collection_test.rb
+++ b/services/api/test/unit/collection_test.rb
@@ -52,45 +52,27 @@ class CollectionTest < ActiveSupport::TestCase
   end
 
   [
-    [2**15, 0, false],
-    [2**15, 100, false],
-    [2**15, 2**13, false],
-    [2**15, 2**18, true],
-    [100, 2**18, true],
-    [2**18, 100, false],  # file_names has a max size, hence no error even on large manifest
-  ].each do |manifest_size, description_size, expect_exception|
-    test "create collection with manifest size #{manifest_size},
-          description size #{description_size},
-          expect exception #{expect_exception}" do
+    2**8,
+    2**18,
+  ].each do |manifest_size|
+    test "create collection with manifest size #{manifest_size} and
+          not expect exceptions even on very large manifest texts" do
+      # file_names has a max size, hence there will be no errors even on large manifests
       act_as_system_user do
         manifest_text = '. d41d8cd98f00b204e9800998ecf8427e+0'
         index = 0
         while manifest_text.length < manifest_size
-          manifest_text += ' ' + "0:0:longlongfile#{index}.txt"
+          manifest_text += ' ' + "0:0:veryverylongfilename000000000000#{index}.txt"
           index += 1
         end
         manifest_text += "\n"
 
-        description = ''
-        while description.length < description_size
-          description += 'a'
-        end
-
-        begin
-          c = Collection.create(manifest_text: manifest_text, description: description)
-        rescue Exception => e
-        end
+        c = Collection.create(manifest_text: manifest_text)
 
-        if !expect_exception
-          assert c.valid?
-          created_file_names = c.file_names
-          assert created_file_names
-        else
-          assert e
-          assert e.message.include? 'exceeds maximum'
-        end
+        assert c.valid?
+        created_file_names = c.file_names
+        assert created_file_names
       end
     end
   end
-
 end