replace assertThat(x).containsOnlyElementsOf with .hasSameElementsAs

The former assertion has been deprecated because its name is confusing, users were expecting it to behave like `.isSubsetOf`. Signed-off-by: Manfred Hanke <Manfred.Hanke@tngtech.com>
TNG · Oct 1, 2022 · 4b0aa34 · 4b0aa34
1 parent 506030b
commit 4b0aa34
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 22 deletions.
diff --git a/archunit/src/test/java/com/tngtech/archunit/core/domain/JavaClassesTest.java b/archunit/src/test/java/com/tngtech/archunit/core/domain/JavaClassesTest.java
@@ -44,7 +44,7 @@ public void restriction_on_classes_should_keep_the_original_package_tree() {
     public void creation_of_JavaClasses_from_existing_classes_should_keep_the_original_package_tree() {
         JavaClasses classes = JavaClasses.of(singletonList(ALL_CLASSES.get(SomeClass.class)));
 
-        assertThat(classes.getDefaultPackage().getAllClasses()).containsOnlyElementsOf(ALL_CLASSES.getDefaultPackage().getAllClasses());
+        assertThat(classes.getDefaultPackage().getAllClasses()).hasSameElementsAs(ALL_CLASSES.getDefaultPackage().getAllClasses());
     }
 
     @Test

diff --git a/archunit/src/test/java/com/tngtech/archunit/core/domain/JavaCodeUnitTest.java b/archunit/src/test/java/com/tngtech/archunit/core/domain/JavaCodeUnitTest.java
@@ -32,7 +32,7 @@ public void offers_all_calls_from_Self() {
 
         assertThat(method.getCallsFromSelf())
                 .hasSize(4)
-                .containsOnlyElementsOf(union(method.getConstructorCallsFromSelf(), method.getMethodCallsFromSelf()));
+                .hasSameElementsAs(union(method.getConstructorCallsFromSelf(), method.getMethodCallsFromSelf()));
     }
 
     @Test
@@ -41,7 +41,7 @@ public void offers_all_accesses_from_Self() {
 
         assertThat(method.getAccessesFromSelf())
                 .hasSize(6)
-                .containsOnlyElementsOf(ImmutableList.<JavaAccess<?>>builder()
+                .hasSameElementsAs(ImmutableList.<JavaAccess<?>>builder()
                         .addAll(method.getConstructorCallsFromSelf())
                         .addAll(method.getMethodCallsFromSelf())
                         .addAll(method.getFieldAccesses())

diff --git a/...it/src/test/java/com/tngtech/archunit/core/importer/ClassFileImporterAnnotationsTest.java b/...it/src/test/java/com/tngtech/archunit/core/importer/ClassFileImporterAnnotationsTest.java
@@ -580,7 +580,7 @@ void notToFind() {
                 classes.get(Dependent.class).getConstructor(getClass()).getAnnotationOfType(ParameterAnnotation.class.getName()),
                 classes.get(Dependent.class).getMethod("method").getAnnotationOfType(ParameterAnnotation.class.getName())
         );
-        assertThat(annotations).as("annotations with parameter type " + String.class.getSimpleName()).containsOnlyElementsOf(expected);
+        assertThat(annotations).as("annotations with parameter type " + String.class.getSimpleName()).hasSameElementsAs(expected);
     }
 
     @SuppressWarnings({"unchecked", "unused"})

diff --git a/archunit/src/test/java/com/tngtech/archunit/core/importer/ClassFileSourceTest.java b/archunit/src/test/java/com/tngtech/archunit/core/importer/ClassFileSourceTest.java
@@ -169,7 +169,7 @@ private void assertSourceMatches(ClassFileSource source, Set<String> expectedInc
                 .extracting("uri")
                 .extractingResultOf("toString")
                 .usingElementComparator(MATCH_IF_EXPECTED_IS_SUBSTRING)
-                .containsOnlyElementsOf(expectedIncluded);
+                .hasSameElementsAs(expectedIncluded);
     }
 
     private static ImportOptions locationContains(final String part) {

diff --git a/archunit/src/test/java/com/tngtech/archunit/core/importer/LocationTest.java b/archunit/src/test/java/com/tngtech/archunit/core/importer/LocationTest.java
@@ -69,7 +69,7 @@ public void iterate_entries_of_whole_jar() {
 
         assertThat(location.streamEntries())
                 .as("entries of JAR")
-                .containsOnlyElementsOf(Sets.difference(entries, singleton(packageEntry(DescribedPredicate.class))));
+                .hasSameElementsAs(Sets.difference(entries, singleton(packageEntry(DescribedPredicate.class))));
     }
 
     @Test
@@ -86,7 +86,7 @@ public void iterate_entries_of_package_of_jar_url() {
 
         assertThat(location.streamEntries())
                 .as("entries of JAR")
-                .containsOnlyElementsOf(Sets.difference(entries, singleton(packageEntry(DescribedPredicate.class))));
+                .hasSameElementsAs(Sets.difference(entries, singleton(packageEntry(DescribedPredicate.class))));
 
         location = Location.of(jarUriOfEntry(jarFile, packageEntry(getClass())));
 

diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/TransformersTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/TransformersTest.java
@@ -30,7 +30,7 @@ public void test_classes() {
 
         DescribedIterable<JavaClass> output = Transformers.classes().transform(input);
 
-        assertThat(output).containsOnlyElementsOf(input);
+        assertThat(output).hasSameElementsAs(input);
     }
 
     @DataProvider

diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/CodeUnitsShouldTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/CodeUnitsShouldTest.java
@@ -176,7 +176,7 @@ public void parameter_types_predicates(ArchRule rule, Collection<String> expecte
         EvaluationResult result = rule.evaluate(importClasses(ClassWithVariousMembers.class));
 
         Set<String> actualMembers = parseMembers(ClassWithVariousMembers.class, result.getFailureReport().getDetails());
-        assertThat(actualMembers).containsOnlyElementsOf(expectedMembers);
+        assertThat(actualMembers).hasSameElementsAs(expectedMembers);
     }
 
     @DataProvider
@@ -229,7 +229,7 @@ public void return_type_predicates(ArchRule rule, Collection<String> expectedMem
         EvaluationResult result = rule.evaluate(importClasses(ClassWithVariousMembers.class));
 
         Set<String> actualMembers = parseMembers(ClassWithVariousMembers.class, result.getFailureReport().getDetails());
-        assertThat(actualMembers).containsOnlyElementsOf(expectedMembers);
+        assertThat(actualMembers).hasSameElementsAs(expectedMembers);
     }
 
     @DataProvider
@@ -282,7 +282,7 @@ public void throwable_type_predicates(ArchRule rule, Collection<String> expected
         EvaluationResult result = rule.evaluate(importClasses(ClassWithVariousMembers.class));
 
         Set<String> actualMembers = parseMembers(ClassWithVariousMembers.class, result.getFailureReport().getDetails());
-        assertThat(actualMembers).containsOnlyElementsOf(expectedMembers);
+        assertThat(actualMembers).hasSameElementsAs(expectedMembers);
     }
 
     @DataProvider

diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/FieldsShouldTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/FieldsShouldTest.java
@@ -68,7 +68,7 @@ public void property_predicates(ArchRule rule, Collection<String> expectedViolat
                 .evaluate(importClasses(ClassWithVariousMembers.class));
 
         Set<String> actualFields = parseMembers(ClassWithVariousMembers.class, result.getFailureReport().getDetails());
-        assertThat(actualFields).containsOnlyElementsOf(expectedViolatingFields);
+        assertThat(actualFields).hasSameElementsAs(expectedViolatingFields);
     }
 
     private static final String FIELD_A = "fieldA";

diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenCodeUnitsTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenCodeUnitsTest.java
@@ -176,7 +176,7 @@ public void parameter_types_predicates(DescribedRuleStart ruleStart, Collection<
         EvaluationResult result = ruleStart.should(everythingViolationPrintMemberName())
                 .evaluate(importClasses(ClassWithVariousMembers.class));
 
-        assertThat(result.getFailureReport().getDetails()).containsOnlyElementsOf(expectedMembers);
+        assertThat(result.getFailureReport().getDetails()).hasSameElementsAs(expectedMembers);
     }
 
     @DataProvider
@@ -219,7 +219,7 @@ public void return_type_predicates(DescribedRuleStart ruleStart, Collection<Stri
         EvaluationResult result = ruleStart.should(everythingViolationPrintMemberName())
                 .evaluate(importClasses(ClassWithVariousMembers.class));
 
-        assertThat(result.getFailureReport().getDetails()).containsOnlyElementsOf(expectedMembers);
+        assertThat(result.getFailureReport().getDetails()).hasSameElementsAs(expectedMembers);
     }
 
     @DataProvider
@@ -275,7 +275,7 @@ public void throwable_type_predicates(DescribedRuleStart ruleStart, Collection<S
         EvaluationResult result = ruleStart.should(everythingViolationPrintMemberName())
                 .evaluate(importClasses(ClassWithVariousMembers.class));
 
-        assertThat(result.getFailureReport().getDetails()).containsOnlyElementsOf(expectedMembers);
+        assertThat(result.getFailureReport().getDetails()).hasSameElementsAs(expectedMembers);
     }
 
     static DescribedPredicate<List<JavaClass>> oneParameterOfType(final Class<?> type) {

diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenFieldsTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenFieldsTest.java
@@ -72,7 +72,7 @@ public void property_predicates(DescribedRuleStart ruleStart, Collection<String>
         EvaluationResult result = ruleStart.should(everythingViolationPrintMemberName())
                 .evaluate(importClasses(ClassWithVariousMembers.class));
 
-        assertThat(result.getFailureReport().getDetails()).containsOnlyElementsOf(expectedMembers);
+        assertThat(result.getFailureReport().getDetails()).hasSameElementsAs(expectedMembers);
     }
 
     private static Set<String> allFieldsExcept(String... fieldNames) {

diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenMembersTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenMembersTest.java
@@ -132,7 +132,7 @@ public void test_members(GivenMembers<JavaMember> members, String ruleStart, Arc
         EvaluationResult result = rule.evaluate(importClasses(ClassWithVariousMembers.class));
 
         assertViolation(result);
-        assertThat(result.getFailureReport().getDetails()).containsOnlyElementsOf(expectedViolationDetails);
+        assertThat(result.getFailureReport().getDetails()).hasSameElementsAs(expectedViolationDetails);
     }
 
     @Test
@@ -381,7 +381,7 @@ public void property_predicates(DescribedRuleStart conjunction, Set<String> expe
         EvaluationResult result = conjunction.should(everythingViolationPrintMemberName())
                 .evaluate(importClasses(ClassWithVariousMembers.class, A.class, B.class, C.class, MetaAnnotation.class));
 
-        assertThat(result.getFailureReport().getDetails()).containsOnlyElementsOf(expectedMessages);
+        assertThat(result.getFailureReport().getDetails()).hasSameElementsAs(expectedMessages);
     }
 
     @DataProvider
@@ -432,7 +432,7 @@ public void declaration_predicates(DescribedRuleStart conjunction, Set<String> e
         EvaluationResult result = conjunction.should(everythingViolationPrintMemberName())
                 .evaluate(importClasses(ClassWithVariousMembers.class, OtherClassWithMembers.class));
 
-        assertThat(result.getFailureReport().getDetails()).containsOnlyElementsOf(expectedMessages);
+        assertThat(result.getFailureReport().getDetails()).hasSameElementsAs(expectedMessages);
     }
 
     static void assertViolation(EvaluationResult result) {

diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenMethodsTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenMethodsTest.java
@@ -38,7 +38,7 @@ public void property_predicates(DescribedRuleStart ruleStart, Collection<String>
         EvaluationResult result = ruleStart.should(everythingViolationPrintMemberName())
                 .evaluate(importClasses(ClassWithVariousMembers.class));
 
-        assertThat(result.getFailureReport().getDetails()).containsOnlyElementsOf(expectedMembers);
+        assertThat(result.getFailureReport().getDetails()).hasSameElementsAs(expectedMembers);
     }
 
     private static final String METHOD_A = "methodA([I)";

diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/MethodsShouldTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/MethodsShouldTest.java
@@ -40,7 +40,7 @@ public void property_predicates(ArchRule ruleStart, Collection<String> expectedM
         EvaluationResult result = ruleStart.evaluate(importClasses(ClassWithVariousMembers.class));
 
         Set<String> actualMethods = parseMembers(ClassWithVariousMembers.class, result.getFailureReport().getDetails());
-        assertThat(actualMethods).containsOnlyElementsOf(expectedMembers);
+        assertThat(actualMethods).hasSameElementsAs(expectedMembers);
     }
 
     private static final String METHOD_A = "methodA([I)";

diff --git a/archunit/src/test/java/com/tngtech/archunit/testutil/assertion/JavaTypesAssertion.java b/archunit/src/test/java/com/tngtech/archunit/testutil/assertion/JavaTypesAssertion.java
@@ -34,7 +34,7 @@ public JavaTypesAssertion(Iterable<? extends JavaType> actual) {
     }
 
     public void matchInAnyOrder(Iterable<Class<?>> classes) {
-        assertThat(HasName.Utils.namesOf(actual)).as(descriptionText()).containsOnlyElementsOf(formatNamesOf(classes));
+        assertThat(HasName.Utils.namesOf(actual)).as(descriptionText()).hasSameElementsAs(formatNamesOf(classes));
 
         JavaType[] actualSorted = sortedJavaTypes(actual);
         Class<?>[] expectedSorted = sortedClasses(classes);