14484: Moves test for grouping pdhs to its own file
authorEric Biagiotti <ebiagiotti@veritasgenetics.com>
Fri, 29 Mar 2019 19:08:36 +0000 (15:08 -0400)
committerEric Biagiotti <ebiagiotti@veritasgenetics.com>
Fri, 29 Mar 2019 19:08:36 +0000 (15:08 -0400)
Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>

services/api/test/unit/container_test.rb
services/api/test/unit/group_pdhs_test.rb [new file with mode: 0644]

index 783d2a985fa569d8a2cd0275a28441e60636c2c9..1a53df7dab4a2b76e260b00d213f659a35db1b29 100644 (file)
@@ -956,23 +956,4 @@ class ContainerTest < ActiveSupport::TestCase
       assert_no_secrets_logged
     end
   end
       assert_no_secrets_logged
     end
   end
-
-  # NOTE: Migration 20190322174136_add_file_info_to_collection.rb 
-  # relies on this test. Change with caution!
-  test "pdh_grouping_by_manifest_size" do
-    batch_size_max = 200
-    pdhs_in = ['x1+30', 'x2+30', 'x3+201', 'x4+100', 'x5+100']
-    pdh_lambda = lambda { |last_pdh, &block|
-      pdhs = pdhs_in.select{|pdh| pdh > last_pdh} 
-      pdhs.each do |p|
-        block.call(p)
-      end
-    }
-    batched_pdhs = []
-    Container.group_pdhs_for_multiple_transactions(pdh_lambda, pdhs_in.size, batch_size_max, "") do |pdhs|
-      batched_pdhs << pdhs
-    end
-    expected = [['x1+30', 'x2+30'], ['x3+201'], ['x4+100', 'x5+100']]
-    assert_equal(batched_pdhs, expected)
-  end
 end
 end
diff --git a/services/api/test/unit/group_pdhs_test.rb b/services/api/test/unit/group_pdhs_test.rb
new file mode 100644 (file)
index 0000000..82256e6
--- /dev/null
@@ -0,0 +1,27 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
+require 'test_helper'
+require 'group_pdhs'
+
+# NOTE: Migration 20190322174136_add_file_info_to_collection.rb
+# relies on this test. Change with caution!
+class GroupPdhsTest < ActiveSupport::TestCase
+  test "pdh_grouping_by_manifest_size" do
+    batch_size_max = 200
+    pdhs_in = ['x1+30', 'x2+30', 'x3+201', 'x4+100', 'x5+100']
+    pdh_lambda = lambda { |last_pdh, &block|
+      pdhs = pdhs_in.select{|pdh| pdh > last_pdh} 
+      pdhs.each do |p|
+        block.call(p)
+      end
+    }
+    batched_pdhs = []
+    GroupPdhs.group_pdhs_for_multiple_transactions(pdh_lambda, pdhs_in.size, batch_size_max, "") do |pdhs|
+      batched_pdhs << pdhs
+    end
+    expected = [['x1+30', 'x2+30'], ['x3+201'], ['x4+100', 'x5+100']]
+    assert_equal(batched_pdhs, expected)
+  end
+end