From: Eric Biagiotti Date: Fri, 29 Mar 2019 19:08:36 +0000 (-0400) Subject: 14484: Moves test for grouping pdhs to its own file X-Git-Tag: 1.4.0~77^2~6 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/e26648fc591101349db5644c9927651f84972c3d 14484: Moves test for grouping pdhs to its own file Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti --- diff --git a/services/api/test/unit/container_test.rb b/services/api/test/unit/container_test.rb index 783d2a985f..1a53df7dab 100644 --- a/services/api/test/unit/container_test.rb +++ b/services/api/test/unit/container_test.rb @@ -956,23 +956,4 @@ class ContainerTest < ActiveSupport::TestCase 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 diff --git a/services/api/test/unit/group_pdhs_test.rb b/services/api/test/unit/group_pdhs_test.rb new file mode 100644 index 0000000000..82256e61bd --- /dev/null +++ b/services/api/test/unit/group_pdhs_test.rb @@ -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