update and rename test suites
diff --git a/lib/unittest.bzl b/lib/unittest.bzl
index 76b3538..85f12e3 100644
--- a/lib/unittest.bzl
+++ b/lib/unittest.bzl
@@ -20,7 +20,7 @@
"""
load(":new_sets.bzl", new_sets = "sets")
-load(":sets.bzl", "sets")
+load(":old_sets.bzl", "sets")
load(":types.bzl", "types")
# The following function should only be called from WORKSPACE files and workspace macros.
diff --git a/tests/BUILD b/tests/BUILD
index 0b1706f..e27cdd5 100644
--- a/tests/BUILD
+++ b/tests/BUILD
@@ -3,11 +3,11 @@
load(":collections_tests.bzl", "collections_test_suite")
load(":dicts_tests.bzl", "dicts_test_suite")
load(":maprule_tests.bzl", "maprule_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")
load(":selects_tests.bzl", "selects_test_suite")
-load(":sets_tests.bzl", "sets_test_suite")
load(":shell_tests.bzl", "shell_args_test_gen", "shell_test_suite")
load(":structs_tests.bzl", "structs_test_suite")
load(":types_tests.bzl", "types_test_suite")
@@ -29,16 +29,16 @@
maprule_test_suite()
+old_sets_test_suite()
+
+new_sets_test_suite()
+
partial_test_suite()
paths_test_suite()
selects_test_suite()
-sets_test_suite()
-
-new_sets_test_suite()
-
shell_test_suite()
structs_test_suite()
diff --git a/tests/sets_tests.bzl b/tests/old_sets_tests.bzl
similarity index 96%
rename from tests/sets_tests.bzl
rename to tests/old_sets_tests.bzl
index f7d99bb..638a9c3 100644
--- a/tests/sets_tests.bzl
+++ b/tests/old_sets_tests.bzl
@@ -12,9 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-"""Unit tests for sets.bzl."""
+"""Unit tests for old_sets.bzl."""
-load("//lib:sets.bzl", "sets")
+load("//lib:old_sets.bzl", "sets")
load("//lib:unittest.bzl", "asserts", "unittest")
def _is_equal_test(ctx):
@@ -140,10 +140,10 @@
difference_test = unittest.make(_difference_test)
-def sets_test_suite():
- """Creates the test targets and test suite for sets.bzl tests."""
+def old_sets_test_suite():
+ """Creates the test targets and test suite for old_sets.bzl tests."""
unittest.suite(
- "sets_tests",
+ "old_sets_tests",
disjoint_test,
intersection_test,
is_equal_test,
