diff options
author | Laurent Le Brun <laurentlb@gmail.com> | 2020-02-03 16:39:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-03 16:39:21 +0100 |
commit | e583e822a0bb99e04cd4a2b9a3baf5e1088a214d (patch) | |
tree | c04a11d6b3112822ca34ceffab0b9651503bfa41 /tests | |
parent | 4b25373d12887f5add565197c4a163e9f1d9b716 (diff) | |
download | bazel-skylib-e583e822a0bb99e04cd4a2b9a3baf5e1088a214d.tar.gz |
Remove old_sets.bzl (#231)
It has been deprecated for a while, the code is not really compatible with Bazel depset-related changes.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/BUILD | 4 | ||||
-rw-r--r-- | tests/old_sets_tests.bzl | 153 | ||||
-rwxr-xr-x | tests/unittest_test.sh | 1 |
3 files changed, 0 insertions, 158 deletions
diff --git a/tests/BUILD b/tests/BUILD index fa159e9..4e69eca 100644 --- a/tests/BUILD +++ b/tests/BUILD @@ -2,7 +2,6 @@ load("//:bzl_library.bzl", "bzl_library") load(":build_test_tests.bzl", "build_test_test_suite") load(":collections_tests.bzl", "collections_test_suite") load(":dicts_tests.bzl", "dicts_test_suite") -load(":old_sets_tests.bzl", "old_sets_test_suite") load(":new_sets_tests.bzl", "new_sets_test_suite") load(":partial_tests.bzl", "partial_test_suite") load(":paths_tests.bzl", "paths_test_suite") @@ -26,8 +25,6 @@ collections_test_suite() dicts_test_suite() -old_sets_test_suite() - new_sets_test_suite() partial_test_suite() @@ -61,7 +58,6 @@ sh_test( ":unittest_tests_bzl", "//lib:dicts.bzl", "//lib:new_sets.bzl", - "//lib:old_sets.bzl", "//lib:sets.bzl", "//lib:types.bzl", "//lib:unittest.bzl", diff --git a/tests/old_sets_tests.bzl b/tests/old_sets_tests.bzl deleted file mode 100644 index 638a9c3..0000000 --- a/tests/old_sets_tests.bzl +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 2017 The Bazel Authors. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""Unit tests for old_sets.bzl.""" - -load("//lib:old_sets.bzl", "sets") -load("//lib:unittest.bzl", "asserts", "unittest") - -def _is_equal_test(ctx): - """Unit tests for sets.is_equal.""" - - # Note that if this test fails, the results for the other `sets` tests will - # be inconclusive because they use `asserts.set_equals`, which in turn calls - # `sets.is_equal`. - env = unittest.begin(ctx) - - asserts.true(env, sets.is_equal([], [])) - asserts.false(env, sets.is_equal([], [1])) - asserts.false(env, sets.is_equal([1], [])) - asserts.true(env, sets.is_equal([1], [1])) - asserts.false(env, sets.is_equal([1], [1, 2])) - asserts.false(env, sets.is_equal([1], [2])) - asserts.false(env, sets.is_equal([1], depset([1, 2]))) - - # Verify that the implementation is not using == on the sets directly. - asserts.true(env, sets.is_equal(depset([1]), depset([1]))) - - # If passing a list, verify that duplicate elements are ignored. - asserts.true(env, sets.is_equal([1, 1], [1])) - - return unittest.end(env) - -is_equal_test = unittest.make(_is_equal_test) - -def _is_subset_test(ctx): - """Unit tests for sets.is_subset.""" - env = unittest.begin(ctx) - - asserts.true(env, sets.is_subset([], [])) - asserts.true(env, sets.is_subset([], [1])) - asserts.false(env, sets.is_subset([1], [])) - asserts.true(env, sets.is_subset([1], [1])) - asserts.true(env, sets.is_subset([1], [1, 2])) - asserts.false(env, sets.is_subset([1], [2])) - asserts.true(env, sets.is_subset([1], depset([1, 2]))) - - # If passing a list, verify that duplicate elements are ignored. - asserts.true(env, sets.is_subset([1, 1], [1, 2])) - - return unittest.end(env) - -is_subset_test = unittest.make(_is_subset_test) - -def _disjoint_test(ctx): - """Unit tests for sets.disjoint.""" - env = unittest.begin(ctx) - - asserts.true(env, sets.disjoint([], [])) - asserts.true(env, sets.disjoint([], [1])) - asserts.true(env, sets.disjoint([1], [])) - asserts.false(env, sets.disjoint([1], [1])) - asserts.false(env, sets.disjoint([1], [1, 2])) - asserts.true(env, sets.disjoint([1], [2])) - asserts.true(env, sets.disjoint([1], depset([2]))) - - # If passing a list, verify that duplicate elements are ignored. - asserts.false(env, sets.disjoint([1, 1], [1, 2])) - - return unittest.end(env) - -disjoint_test = unittest.make(_disjoint_test) - -def _intersection_test(ctx): - """Unit tests for sets.intersection.""" - env = unittest.begin(ctx) - - asserts.set_equals(env, [], sets.intersection([], [])) - asserts.set_equals(env, [], sets.intersection([], [1])) - asserts.set_equals(env, [], sets.intersection([1], [])) - asserts.set_equals(env, [1], sets.intersection([1], [1])) - asserts.set_equals(env, [1], sets.intersection([1], [1, 2])) - asserts.set_equals(env, [], sets.intersection([1], [2])) - asserts.set_equals(env, [1], sets.intersection([1], depset([1]))) - - # If passing a list, verify that duplicate elements are ignored. - asserts.set_equals(env, [1], sets.intersection([1, 1], [1, 2])) - - return unittest.end(env) - -intersection_test = unittest.make(_intersection_test) - -def _union_test(ctx): - """Unit tests for sets.union.""" - env = unittest.begin(ctx) - - asserts.set_equals(env, [], sets.union()) - asserts.set_equals(env, [1], sets.union([1])) - asserts.set_equals(env, [], sets.union([], [])) - asserts.set_equals(env, [1], sets.union([], [1])) - asserts.set_equals(env, [1], sets.union([1], [])) - asserts.set_equals(env, [1], sets.union([1], [1])) - asserts.set_equals(env, [1, 2], sets.union([1], [1, 2])) - asserts.set_equals(env, [1, 2], sets.union([1], [2])) - asserts.set_equals(env, [1], sets.union([1], depset([1]))) - - # If passing a list, verify that duplicate elements are ignored. - asserts.set_equals(env, [1, 2], sets.union([1, 1], [1, 2])) - - return unittest.end(env) - -union_test = unittest.make(_union_test) - -def _difference_test(ctx): - """Unit tests for sets.difference.""" - env = unittest.begin(ctx) - - asserts.set_equals(env, [], sets.difference([], [])) - asserts.set_equals(env, [], sets.difference([], [1])) - asserts.set_equals(env, [1], sets.difference([1], [])) - asserts.set_equals(env, [], sets.difference([1], [1])) - asserts.set_equals(env, [], sets.difference([1], [1, 2])) - asserts.set_equals(env, [1], sets.difference([1], [2])) - asserts.set_equals(env, [], sets.difference([1], depset([1]))) - - # If passing a list, verify that duplicate elements are ignored. - asserts.set_equals(env, [2], sets.difference([1, 2], [1, 1])) - - return unittest.end(env) - -difference_test = unittest.make(_difference_test) - -def old_sets_test_suite(): - """Creates the test targets and test suite for old_sets.bzl tests.""" - unittest.suite( - "old_sets_tests", - disjoint_test, - intersection_test, - is_equal_test, - is_subset_test, - difference_test, - union_test, - ) diff --git a/tests/unittest_test.sh b/tests/unittest_test.sh index a74c1df..baed490 100755 --- a/tests/unittest_test.sh +++ b/tests/unittest_test.sh @@ -73,7 +73,6 @@ exports_files(["*.bzl"]) EOF ln -sf "$(rlocation bazel_skylib/lib/dicts.bzl)" lib/dicts.bzl ln -sf "$(rlocation bazel_skylib/lib/new_sets.bzl)" lib/new_sets.bzl - ln -sf "$(rlocation bazel_skylib/lib/old_sets.bzl)" lib/old_sets.bzl ln -sf "$(rlocation bazel_skylib/lib/sets.bzl)" lib/sets.bzl ln -sf "$(rlocation bazel_skylib/lib/types.bzl)" lib/types.bzl ln -sf "$(rlocation bazel_skylib/lib/unittest.bzl)" lib/unittest.bzl |