From 2129f9af76958697eca814b2d05fcc6d6c325dae Mon Sep 17 00:00:00 2001 From: Matt Bertolini Date: Sun, 5 Apr 2026 19:04:48 -0400 Subject: [PATCH 1/2] Move the multimap assertions and core entrypoint assertion types out of the api package. --- src/main/java/module-info.java | 4 +-- .../collections/{api => }/Assertions.java | 4 +-- .../collections/{api => }/BDDAssertions.java | 4 +-- ...ipseCollectionsSoftAssertionsProvider.java | 4 +-- .../collections/{api => }/SoftAssertions.java | 2 +- .../{api => }/multimap/MultimapAssert.java | 2 +- src/test/java/module-info.java | 2 +- .../MultimapAssert_ContainsEntry_Test.java | 14 +++++----- .../MultimapAssert_ContainsKeys_Test.java | 14 +++++----- .../MultimapAssert_ContainsOnly_Test.java | 26 +++++++++---------- .../MultimapAssert_ContainsValues_Test.java | 14 +++++----- .../MultimapAssert_Contains_Test.java | 6 ++--- ...ssert_HasDistinctSizeGreaterThan_Test.java | 16 ++++++------ .../MultimapAssert_HasDistinctSize_Test.java | 12 ++++----- .../MultimapAssert_HasKeySatisfying_Test.java | 12 ++++----- .../MultimapAssert_HasSizeBetween_Test.java | 20 +++++++------- ...ultimapAssert_HasSizeGreaterThan_Test.java | 16 ++++++------ ...pAssert_HasSizeLessThanOrEqualTo_Test.java | 14 +++++----- .../MultimapAssert_HasSizeLessThan_Test.java | 14 +++++----- .../multimap/MultimapAssert_HasSize_Test.java | 12 ++++----- ...ultimapAssert_HasValueSatisfying_Test.java | 6 ++--- .../multimap/MultimapAssert_IsEmpty_Test.java | 12 ++++----- .../MultimapAssert_IsNotEmpty_Test.java | 12 ++++----- .../MultimapAssert_IsNullOrEmpty_Test.java | 12 ++++----- .../{api => }/multimap/MultimapTestData.java | 2 +- 25 files changed, 128 insertions(+), 128 deletions(-) rename src/main/java/org/assertj/eclipse/collections/{api => }/Assertions.java (92%) rename src/main/java/org/assertj/eclipse/collections/{api => }/BDDAssertions.java (93%) rename src/main/java/org/assertj/eclipse/collections/{api => }/EclipseCollectionsSoftAssertionsProvider.java (92%) rename src/main/java/org/assertj/eclipse/collections/{api => }/SoftAssertions.java (97%) rename src/main/java/org/assertj/eclipse/collections/{api => }/multimap/MultimapAssert.java (99%) rename src/test/java/org/assertj/eclipse/collections/test/{api => }/multimap/MultimapAssert_ContainsEntry_Test.java (79%) rename src/test/java/org/assertj/eclipse/collections/test/{api => }/multimap/MultimapAssert_ContainsKeys_Test.java (79%) rename src/test/java/org/assertj/eclipse/collections/test/{api => }/multimap/MultimapAssert_ContainsOnly_Test.java (85%) rename src/test/java/org/assertj/eclipse/collections/test/{api => }/multimap/MultimapAssert_ContainsValues_Test.java (80%) rename src/test/java/org/assertj/eclipse/collections/test/{api => }/multimap/MultimapAssert_Contains_Test.java (96%) rename src/test/java/org/assertj/eclipse/collections/test/{api => }/multimap/MultimapAssert_HasDistinctSizeGreaterThan_Test.java (80%) rename src/test/java/org/assertj/eclipse/collections/test/{api => }/multimap/MultimapAssert_HasDistinctSize_Test.java (79%) rename src/test/java/org/assertj/eclipse/collections/test/{api => }/multimap/MultimapAssert_HasKeySatisfying_Test.java (81%) rename src/test/java/org/assertj/eclipse/collections/test/{api => }/multimap/MultimapAssert_HasSizeBetween_Test.java (77%) rename src/test/java/org/assertj/eclipse/collections/test/{api => }/multimap/MultimapAssert_HasSizeGreaterThan_Test.java (79%) rename src/test/java/org/assertj/eclipse/collections/test/{api => }/multimap/MultimapAssert_HasSizeLessThanOrEqualTo_Test.java (78%) rename src/test/java/org/assertj/eclipse/collections/test/{api => }/multimap/MultimapAssert_HasSizeLessThan_Test.java (79%) rename src/test/java/org/assertj/eclipse/collections/test/{api => }/multimap/MultimapAssert_HasSize_Test.java (78%) rename src/test/java/org/assertj/eclipse/collections/test/{api => }/multimap/MultimapAssert_HasValueSatisfying_Test.java (94%) rename src/test/java/org/assertj/eclipse/collections/test/{api => }/multimap/MultimapAssert_IsEmpty_Test.java (79%) rename src/test/java/org/assertj/eclipse/collections/test/{api => }/multimap/MultimapAssert_IsNotEmpty_Test.java (78%) rename src/test/java/org/assertj/eclipse/collections/test/{api => }/multimap/MultimapAssert_IsNullOrEmpty_Test.java (80%) rename src/test/java/org/assertj/eclipse/collections/test/{api => }/multimap/MultimapTestData.java (99%) diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index cecf069..edf51e5 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -17,8 +17,8 @@ * Main AssertJ Eclipse Collections Module */ module org.assertj.eclipse.collections { - exports org.assertj.eclipse.collections.api; - exports org.assertj.eclipse.collections.api.multimap; + exports org.assertj.eclipse.collections; + exports org.assertj.eclipse.collections.multimap; exports org.assertj.eclipse.collections.error; requires org.assertj.core; diff --git a/src/main/java/org/assertj/eclipse/collections/api/Assertions.java b/src/main/java/org/assertj/eclipse/collections/Assertions.java similarity index 92% rename from src/main/java/org/assertj/eclipse/collections/api/Assertions.java rename to src/main/java/org/assertj/eclipse/collections/Assertions.java index 009d413..0a7be18 100644 --- a/src/main/java/org/assertj/eclipse/collections/api/Assertions.java +++ b/src/main/java/org/assertj/eclipse/collections/Assertions.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.api; +package org.assertj.eclipse.collections; import org.assertj.core.util.CheckReturnValue; -import org.assertj.eclipse.collections.api.multimap.MultimapAssert; +import org.assertj.eclipse.collections.multimap.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; /** diff --git a/src/main/java/org/assertj/eclipse/collections/api/BDDAssertions.java b/src/main/java/org/assertj/eclipse/collections/BDDAssertions.java similarity index 93% rename from src/main/java/org/assertj/eclipse/collections/api/BDDAssertions.java rename to src/main/java/org/assertj/eclipse/collections/BDDAssertions.java index d5aa845..afdd80c 100644 --- a/src/main/java/org/assertj/eclipse/collections/api/BDDAssertions.java +++ b/src/main/java/org/assertj/eclipse/collections/BDDAssertions.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.api; +package org.assertj.eclipse.collections; import org.assertj.core.util.CheckReturnValue; -import org.assertj.eclipse.collections.api.multimap.MultimapAssert; +import org.assertj.eclipse.collections.multimap.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; /** diff --git a/src/main/java/org/assertj/eclipse/collections/api/EclipseCollectionsSoftAssertionsProvider.java b/src/main/java/org/assertj/eclipse/collections/EclipseCollectionsSoftAssertionsProvider.java similarity index 92% rename from src/main/java/org/assertj/eclipse/collections/api/EclipseCollectionsSoftAssertionsProvider.java rename to src/main/java/org/assertj/eclipse/collections/EclipseCollectionsSoftAssertionsProvider.java index c43b450..b4116ce 100644 --- a/src/main/java/org/assertj/eclipse/collections/api/EclipseCollectionsSoftAssertionsProvider.java +++ b/src/main/java/org/assertj/eclipse/collections/EclipseCollectionsSoftAssertionsProvider.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.api; +package org.assertj.eclipse.collections; import org.assertj.core.api.SoftAssertionsProvider; import org.assertj.core.util.CheckReturnValue; -import org.assertj.eclipse.collections.api.multimap.MultimapAssert; +import org.assertj.eclipse.collections.multimap.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; /** diff --git a/src/main/java/org/assertj/eclipse/collections/api/SoftAssertions.java b/src/main/java/org/assertj/eclipse/collections/SoftAssertions.java similarity index 97% rename from src/main/java/org/assertj/eclipse/collections/api/SoftAssertions.java rename to src/main/java/org/assertj/eclipse/collections/SoftAssertions.java index 13015ad..de55f23 100644 --- a/src/main/java/org/assertj/eclipse/collections/api/SoftAssertions.java +++ b/src/main/java/org/assertj/eclipse/collections/SoftAssertions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.api; +package org.assertj.eclipse.collections; import org.assertj.core.api.AbstractSoftAssertions; import org.assertj.core.api.SoftAssertionsProvider; diff --git a/src/main/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert.java b/src/main/java/org/assertj/eclipse/collections/multimap/MultimapAssert.java similarity index 99% rename from src/main/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert.java rename to src/main/java/org/assertj/eclipse/collections/multimap/MultimapAssert.java index 89a5d8d..aadfa2a 100644 --- a/src/main/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert.java +++ b/src/main/java/org/assertj/eclipse/collections/multimap/MultimapAssert.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.api.multimap; +package org.assertj.eclipse.collections.multimap; import static java.util.Objects.requireNonNull; import static org.assertj.core.error.ShouldBeEmpty.shouldBeEmpty; diff --git a/src/test/java/module-info.java b/src/test/java/module-info.java index 4b97ace..f3d2500 100644 --- a/src/test/java/module-info.java +++ b/src/test/java/module-info.java @@ -17,7 +17,7 @@ * Test module for AssertJ Eclipse Collections */ open module org.assertj.eclipse.collections.test { - exports org.assertj.eclipse.collections.test.api.multimap; + exports org.assertj.eclipse.collections.test.multimap; requires org.assertj.eclipse.collections; requires org.assertj.core; diff --git a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_ContainsEntry_Test.java b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_ContainsEntry_Test.java similarity index 79% rename from src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_ContainsEntry_Test.java rename to src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_ContainsEntry_Test.java index a375142..4be0ee8 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_ContainsEntry_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_ContainsEntry_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.api.multimap; +package org.assertj.eclipse.collections.test.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.api.SoftAssertions; -import org.assertj.eclipse.collections.api.multimap.MultimapAssert; +import org.assertj.eclipse.collections.SoftAssertions; +import org.assertj.eclipse.collections.multimap.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,13 +28,13 @@ class MultimapAssert_ContainsEntry_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") void passes(Multimap actual) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).containsEntry("ENT", "Reed")); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") void failsEmpty(Multimap actual) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).containsEntry("ENT", "Reed")) @@ -51,7 +51,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") void failsMissingEntry(Multimap actual) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).containsEntry("VOY", "Kes")) @@ -61,7 +61,7 @@ void failsMissingEntry(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") void softAssertionPasses(Multimap actual) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).containsEntry("ENT", "Reed")); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_ContainsKeys_Test.java b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_ContainsKeys_Test.java similarity index 79% rename from src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_ContainsKeys_Test.java rename to src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_ContainsKeys_Test.java index e29816a..4f22990 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_ContainsKeys_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_ContainsKeys_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.api.multimap; +package org.assertj.eclipse.collections.test.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.api.SoftAssertions; -import org.assertj.eclipse.collections.api.multimap.MultimapAssert; +import org.assertj.eclipse.collections.SoftAssertions; +import org.assertj.eclipse.collections.multimap.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,13 +28,13 @@ class MultimapAssert_ContainsKeys_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") void passes(Multimap actual) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).containsKeys("TOS", "TNG", "DS9")); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") void failsEmpty(Multimap actual) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).containsKeys("TOS", "TNG", "DS9")) @@ -44,7 +44,7 @@ void failsEmpty(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") void failsMissingKey(Multimap actual) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).containsKeys("DIS")) @@ -61,7 +61,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") void softAssertionPasses(Multimap actual) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).containsKeys("TOS", "TNG", "DS9")); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_ContainsOnly_Test.java b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_ContainsOnly_Test.java similarity index 85% rename from src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_ContainsOnly_Test.java rename to src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_ContainsOnly_Test.java index e213074..05d060c 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_ContainsOnly_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_ContainsOnly_Test.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.api.multimap; +package org.assertj.eclipse.collections.test.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; @@ -21,8 +21,8 @@ import java.util.Map; -import org.assertj.eclipse.collections.api.SoftAssertions; -import org.assertj.eclipse.collections.api.multimap.MultimapAssert; +import org.assertj.eclipse.collections.SoftAssertions; +import org.assertj.eclipse.collections.multimap.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.eclipse.collections.api.tuple.Pair; import org.junit.jupiter.api.Test; @@ -32,7 +32,7 @@ class MultimapAssert_ContainsOnly_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#shipMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#shipMultimaps") void passesWithPairs(Multimap actual) { Pair[] exactMatchPairs = new Pair[]{ pair("TNG", "Enterprise"), @@ -44,7 +44,7 @@ void passesWithPairs(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#shipMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#shipMultimaps") void passesWithEntries(Multimap actual) { Map.Entry[] exactMatchEntries = new Map.Entry[]{ pair("TNG", "Enterprise").toEntry(), @@ -56,7 +56,7 @@ void passesWithEntries(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#shipMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#shipMultimaps") void failsWhenAdditionalKeysOrValuesExistWithPair(Multimap actual) { Pair[] partialMatchMissingPairs = new Pair[]{ pair("TNG", "Enterprise"), @@ -70,7 +70,7 @@ void failsWhenAdditionalKeysOrValuesExistWithPair(Multimap actua } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#shipMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#shipMultimaps") void failsWhenAdditionalKeysOrValuesExistWithEntry(Multimap actual) { Map.Entry[] partialMatchMissingEntries = new Map.Entry[]{ pair("TNG", "Enterprise").toEntry(), @@ -84,7 +84,7 @@ void failsWhenAdditionalKeysOrValuesExistWithEntry(Multimap actu } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#shipMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#shipMultimaps") void failsWhenEntryIsMissingWithPair(Multimap actual) { Pair[] partialMatchExtraPairs = new Pair[]{ pair("TOS", "Enterprise"), @@ -100,7 +100,7 @@ void failsWhenEntryIsMissingWithPair(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#shipMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#shipMultimaps") void failsWhenEntryIsMissingWithEntry(Multimap actual) { Map.Entry[] partialMatchExtraEntries = new Map.Entry[]{ pair("TOS", "Enterprise").toEntry(), @@ -116,7 +116,7 @@ void failsWhenEntryIsMissingWithEntry(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") void failsForEmptyMultimapWithPair(Multimap actual) { Pair[] exactMatchPairs = new Pair[]{ pair("TNG", "Enterprise"), @@ -129,7 +129,7 @@ void failsForEmptyMultimapWithPair(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") void failsForEmptyMultimapWithEntry(Multimap actual) { Map.Entry[] exactMatchEntries = new Map.Entry[]{ pair("TNG", "Enterprise").toEntry(), @@ -164,7 +164,7 @@ void failsForNullMultimapWithEntry() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#shipMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#shipMultimaps") void softAssertionPassesWithPairs(Multimap actual) { Pair[] exactMatchPairs = new Pair[]{ pair("TNG", "Enterprise"), @@ -176,7 +176,7 @@ void softAssertionPassesWithPairs(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#shipMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#shipMultimaps") void softAssertionPassesWithEntries(Multimap actual) { Map.Entry[] exactMatchEntries = new Map.Entry[]{ pair("TNG", "Enterprise").toEntry(), diff --git a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_ContainsValues_Test.java b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_ContainsValues_Test.java similarity index 80% rename from src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_ContainsValues_Test.java rename to src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_ContainsValues_Test.java index 617e7f0..9e4054a 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_ContainsValues_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_ContainsValues_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.api.multimap; +package org.assertj.eclipse.collections.test.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.api.SoftAssertions; -import org.assertj.eclipse.collections.api.multimap.MultimapAssert; +import org.assertj.eclipse.collections.SoftAssertions; +import org.assertj.eclipse.collections.multimap.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,13 +28,13 @@ class MultimapAssert_ContainsValues_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") void passes(Multimap actual) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).containsValues("Kirk", "Picard", "Sisko", "Janeway", "Archer")); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") void failsEmpty(Multimap actual) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).containsValues("Kirk", "Picard", "Sisko", "Janeway", "Archer")) @@ -44,7 +44,7 @@ void failsEmpty(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") void failsMissingValue(Multimap actual) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).containsValues("Kes")) @@ -61,7 +61,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") void softAssertionPasses(Multimap actual) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).containsValues("Kirk", "Picard", "Sisko", "Janeway", "Archer")); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_Contains_Test.java b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_Contains_Test.java similarity index 96% rename from src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_Contains_Test.java rename to src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_Contains_Test.java index 95564a7..0af8545 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_Contains_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_Contains_Test.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.api.multimap; +package org.assertj.eclipse.collections.test.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; @@ -23,8 +23,8 @@ import java.util.Map; import java.util.stream.Stream; -import org.assertj.eclipse.collections.api.SoftAssertions; -import org.assertj.eclipse.collections.api.multimap.MultimapAssert; +import org.assertj.eclipse.collections.SoftAssertions; +import org.assertj.eclipse.collections.multimap.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.eclipse.collections.api.tuple.Pair; import org.eclipse.collections.impl.tuple.Tuples; diff --git a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasDistinctSizeGreaterThan_Test.java b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasDistinctSizeGreaterThan_Test.java similarity index 80% rename from src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasDistinctSizeGreaterThan_Test.java rename to src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasDistinctSizeGreaterThan_Test.java index 8dddf31..b8abc6e 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasDistinctSizeGreaterThan_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasDistinctSizeGreaterThan_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.api.multimap; +package org.assertj.eclipse.collections.test.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.api.SoftAssertions; -import org.assertj.eclipse.collections.api.multimap.MultimapAssert; +import org.assertj.eclipse.collections.SoftAssertions; +import org.assertj.eclipse.collections.multimap.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,13 +28,13 @@ class MultimapAssert_HasDistinctSizeGreaterThan_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#distinctSizeLowerBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#distinctSizeLowerBoundaryTestData") void passesGreaterThan(Multimap actual, int lowerBoundary) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).hasDistinctSizeGreaterThan(lowerBoundary)); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#distinctSizeUpperBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#distinctSizeUpperBoundaryTestData") void failsLesser(Multimap actual, int upperBoundary) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasDistinctSizeGreaterThan(upperBoundary)) @@ -43,7 +43,7 @@ void failsLesser(Multimap actual, int upperBoundary) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#distinctSizeEqualsTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#distinctSizeEqualsTestData") void failsEquals(Multimap actual, int equalsBoundary) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasDistinctSizeGreaterThan(equalsBoundary)) @@ -60,7 +60,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") void failsEmptyMultimap(Multimap actual) { int lowerBoundary = 2; // Using the same value as in distinctSizeLowerBoundaryTestData assertThatExceptionOfType(AssertionError.class) @@ -69,7 +69,7 @@ void failsEmptyMultimap(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#distinctSizeLowerBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#distinctSizeLowerBoundaryTestData") void softAssertionPasses(Multimap actual, int lowerBoundary) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).hasDistinctSizeGreaterThan(lowerBoundary)); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasDistinctSize_Test.java b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasDistinctSize_Test.java similarity index 79% rename from src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasDistinctSize_Test.java rename to src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasDistinctSize_Test.java index f957713..c9351ef 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasDistinctSize_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasDistinctSize_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.api.multimap; +package org.assertj.eclipse.collections.test.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.api.SoftAssertions; -import org.assertj.eclipse.collections.api.multimap.MultimapAssert; +import org.assertj.eclipse.collections.SoftAssertions; +import org.assertj.eclipse.collections.multimap.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,13 +28,13 @@ class MultimapAssert_HasDistinctSize_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#distinctSizeEqualsTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#distinctSizeEqualsTestData") void passes(Multimap actual, int expectedSize) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).hasDistinctSize(expectedSize)); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#emptyMultimapsWithExpectedDistinctSize") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimapsWithExpectedDistinctSize") void failsEmpty(Multimap actual, int expectedSize) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasDistinctSize(expectedSize)) @@ -50,7 +50,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#distinctSizeEqualsTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#distinctSizeEqualsTestData") void softAssertionPasses(Multimap actual, int expectedSize) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).hasDistinctSize(expectedSize)); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasKeySatisfying_Test.java b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasKeySatisfying_Test.java similarity index 81% rename from src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasKeySatisfying_Test.java rename to src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasKeySatisfying_Test.java index 99b8093..98c2eb7 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasKeySatisfying_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasKeySatisfying_Test.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.api.multimap; +package org.assertj.eclipse.collections.test.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; import org.assertj.core.api.Condition; -import org.assertj.eclipse.collections.api.SoftAssertions; -import org.assertj.eclipse.collections.api.multimap.MultimapAssert; +import org.assertj.eclipse.collections.SoftAssertions; +import org.assertj.eclipse.collections.multimap.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -32,13 +32,13 @@ class MultimapAssert_HasKeySatisfying_Test { private static final Condition FAILING_CONDITION = new Condition<>("DIS"::equals, "key equals DIS"); @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") void passesKeySatisfying(Multimap actual) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).hasKeySatisfying(PASSING_CONDITION)); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") void failsKeyNotSatisfying(Multimap actual) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasKeySatisfying(FAILING_CONDITION)) @@ -53,7 +53,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") void softAssertionPasses(Multimap actual) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).hasKeySatisfying(PASSING_CONDITION)); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasSizeBetween_Test.java b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSizeBetween_Test.java similarity index 77% rename from src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasSizeBetween_Test.java rename to src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSizeBetween_Test.java index c613870..e5de467 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasSizeBetween_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSizeBetween_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.api.multimap; +package org.assertj.eclipse.collections.test.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.api.SoftAssertions; -import org.assertj.eclipse.collections.api.multimap.MultimapAssert; +import org.assertj.eclipse.collections.SoftAssertions; +import org.assertj.eclipse.collections.multimap.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,25 +28,25 @@ class MultimapAssert_HasSizeBetween_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#sizeBetweenTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeBetweenTestData") void passesSizeBetween(Multimap actual, int lowerBoundary, int upperBoundary) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).hasSizeBetween(lowerBoundary, upperBoundary)); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#sizeBetweenInclusiveUpperTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeBetweenInclusiveUpperTestData") void passesSizeBetweenInclusiveUpper(Multimap actual, int lowerBoundary, int upperBoundary) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).hasSizeBetween(lowerBoundary, upperBoundary)); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#sizeBetweenInclusiveLowerTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeBetweenInclusiveLowerTestData") void passesSizeBetweenInclusiveLower(Multimap actual, int lowerBoundary, int upperBoundary) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).hasSizeBetween(lowerBoundary, upperBoundary)); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#sizeBelowLowerBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeBelowLowerBoundaryTestData") void failsSizeFallsBelowLowerBoundary(Multimap actual, int lowerBoundary, int upperBoundary) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasSizeBetween(lowerBoundary, upperBoundary)) @@ -54,7 +54,7 @@ void failsSizeFallsBelowLowerBoundary(Multimap actual, int lower } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#sizeAboveUpperBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeAboveUpperBoundaryTestData") void failsSizeFallsAboveUpperBoundary(Multimap actual, int lowerBoundary, int upperBoundary) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasSizeBetween(lowerBoundary, upperBoundary)) @@ -69,7 +69,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") void failsEmptyMultimap(Multimap actual) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasSizeBetween(25, 50)) @@ -77,7 +77,7 @@ void failsEmptyMultimap(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#sizeBetweenTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeBetweenTestData") void softAssertionPasses(Multimap actual, int lowerBoundary, int upperBoundary) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).hasSizeBetween(lowerBoundary, upperBoundary)); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasSizeGreaterThan_Test.java b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSizeGreaterThan_Test.java similarity index 79% rename from src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasSizeGreaterThan_Test.java rename to src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSizeGreaterThan_Test.java index b5e0743..7ba00f0 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasSizeGreaterThan_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSizeGreaterThan_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.api.multimap; +package org.assertj.eclipse.collections.test.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.api.SoftAssertions; -import org.assertj.eclipse.collections.api.multimap.MultimapAssert; +import org.assertj.eclipse.collections.SoftAssertions; +import org.assertj.eclipse.collections.multimap.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,13 +28,13 @@ class MultimapAssert_HasSizeGreaterThan_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#sizeLowerBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeLowerBoundaryTestData") void passesGreaterThan(Multimap actual, int lowerBoundary) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).hasSizeGreaterThan(lowerBoundary)); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#sizeUpperBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeUpperBoundaryTestData") void failsLesser(Multimap actual, int upperBoundary) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasSizeGreaterThan(upperBoundary)) @@ -43,7 +43,7 @@ void failsLesser(Multimap actual, int upperBoundary) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#sizeEqualsTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeEqualsTestData") void failsEquals(Multimap actual, int equalsBoundary) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasSizeGreaterThan(equalsBoundary)) @@ -59,7 +59,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") void failsEmptyMultimap(Multimap actual) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasSizeGreaterThan(5)) @@ -67,7 +67,7 @@ void failsEmptyMultimap(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#sizeLowerBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeLowerBoundaryTestData") void softAssertionPasses(Multimap actual, int lowerBoundary) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).hasSizeGreaterThan(lowerBoundary)); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasSizeLessThanOrEqualTo_Test.java b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSizeLessThanOrEqualTo_Test.java similarity index 78% rename from src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasSizeLessThanOrEqualTo_Test.java rename to src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSizeLessThanOrEqualTo_Test.java index 46fd22c..9e55953 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasSizeLessThanOrEqualTo_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSizeLessThanOrEqualTo_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.api.multimap; +package org.assertj.eclipse.collections.test.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.api.SoftAssertions; -import org.assertj.eclipse.collections.api.multimap.MultimapAssert; +import org.assertj.eclipse.collections.SoftAssertions; +import org.assertj.eclipse.collections.multimap.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,19 +28,19 @@ class MultimapAssert_HasSizeLessThanOrEqualTo_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#sizeUpperBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeUpperBoundaryTestData") void passesLessThan(Multimap actual, int upperBoundary) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).hasSizeLessThanOrEqualTo(upperBoundary)); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#sizeEqualsTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeEqualsTestData") void passesEqual(Multimap actual, int equalsBoundary) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).hasSizeLessThanOrEqualTo(equalsBoundary)); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#sizeLowerBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeLowerBoundaryTestData") void failsGreater(Multimap actual, int lowerBoundary) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasSizeLessThanOrEqualTo(lowerBoundary)) @@ -56,7 +56,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#sizeUpperBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeUpperBoundaryTestData") void softAssertionPasses(Multimap actual, int upperBoundary) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).hasSizeLessThanOrEqualTo(upperBoundary)); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasSizeLessThan_Test.java b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSizeLessThan_Test.java similarity index 79% rename from src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasSizeLessThan_Test.java rename to src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSizeLessThan_Test.java index 8fe4dd7..a9066ce 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasSizeLessThan_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSizeLessThan_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.api.multimap; +package org.assertj.eclipse.collections.test.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.api.SoftAssertions; -import org.assertj.eclipse.collections.api.multimap.MultimapAssert; +import org.assertj.eclipse.collections.SoftAssertions; +import org.assertj.eclipse.collections.multimap.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,13 +28,13 @@ class MultimapAssert_HasSizeLessThan_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#sizeUpperBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeUpperBoundaryTestData") void passesLessThan(Multimap actual, int upperBoundary) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).hasSizeLessThan(upperBoundary)); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#sizeLowerBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeLowerBoundaryTestData") void failsGreater(Multimap actual, int lowerBoundary) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasSizeLessThan(lowerBoundary)) @@ -43,7 +43,7 @@ void failsGreater(Multimap actual, int lowerBoundary) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#sizeEqualsTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeEqualsTestData") void failsEquals(Multimap actual, int equalsBoundary) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasSizeLessThan(equalsBoundary)) @@ -59,7 +59,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#sizeUpperBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeUpperBoundaryTestData") void softAssertionPasses(Multimap actual, int upperBoundary) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).hasSizeLessThan(upperBoundary)); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasSize_Test.java b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSize_Test.java similarity index 78% rename from src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasSize_Test.java rename to src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSize_Test.java index 7a8b131..eab40b8 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasSize_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSize_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.api.multimap; +package org.assertj.eclipse.collections.test.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.api.SoftAssertions; -import org.assertj.eclipse.collections.api.multimap.MultimapAssert; +import org.assertj.eclipse.collections.SoftAssertions; +import org.assertj.eclipse.collections.multimap.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,13 +28,13 @@ class MultimapAssert_HasSize_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#sizeEqualsTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeEqualsTestData") void passes(Multimap actual, int expectedSize) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).hasSize(expectedSize)); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#emptyMultimapsWithExpectedSize") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimapsWithExpectedSize") void failsEmpty(Multimap actual, int expectedSize) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasSize(expectedSize)) @@ -49,7 +49,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#sizeEqualsTestData") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeEqualsTestData") void softAssertionPasses(Multimap actual, int expectedSize) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).hasSize(expectedSize)); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasValueSatisfying_Test.java b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasValueSatisfying_Test.java similarity index 94% rename from src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasValueSatisfying_Test.java rename to src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasValueSatisfying_Test.java index afa098a..bba272b 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_HasValueSatisfying_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasValueSatisfying_Test.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.api.multimap; +package org.assertj.eclipse.collections.test.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; @@ -22,8 +22,8 @@ import java.util.stream.Stream; import org.assertj.core.api.Condition; -import org.assertj.eclipse.collections.api.SoftAssertions; -import org.assertj.eclipse.collections.api.multimap.MultimapAssert; +import org.assertj.eclipse.collections.SoftAssertions; +import org.assertj.eclipse.collections.multimap.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_IsEmpty_Test.java b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_IsEmpty_Test.java similarity index 79% rename from src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_IsEmpty_Test.java rename to src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_IsEmpty_Test.java index 5fd6c0f..a63bd6b 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_IsEmpty_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_IsEmpty_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.api.multimap; +package org.assertj.eclipse.collections.test.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.api.SoftAssertions; -import org.assertj.eclipse.collections.api.multimap.MultimapAssert; +import org.assertj.eclipse.collections.SoftAssertions; +import org.assertj.eclipse.collections.multimap.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,13 +28,13 @@ class MultimapAssert_IsEmpty_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") void passes(Multimap actual) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).isEmpty()); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") void failsNotEmpty(Multimap actual) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).isEmpty()) @@ -49,7 +49,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") void softAssertionPasses(Multimap actual) { assertThatNoException().isThrownBy(() -> SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).isEmpty())); diff --git a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_IsNotEmpty_Test.java b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_IsNotEmpty_Test.java similarity index 78% rename from src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_IsNotEmpty_Test.java rename to src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_IsNotEmpty_Test.java index 4e34f0f..29325d7 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_IsNotEmpty_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_IsNotEmpty_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.api.multimap; +package org.assertj.eclipse.collections.test.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.api.SoftAssertions; -import org.assertj.eclipse.collections.api.multimap.MultimapAssert; +import org.assertj.eclipse.collections.SoftAssertions; +import org.assertj.eclipse.collections.multimap.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,13 +28,13 @@ class MultimapAssert_IsNotEmpty_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") void passesNotEmpty(Multimap actual) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).isNotEmpty()); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") void failsEmpty(Multimap actual) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).isNotEmpty()) @@ -49,7 +49,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") void softAssertionPasses(Multimap actual) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).isNotEmpty()); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_IsNullOrEmpty_Test.java b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_IsNullOrEmpty_Test.java similarity index 80% rename from src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_IsNullOrEmpty_Test.java rename to src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_IsNullOrEmpty_Test.java index 43114b1..fc51d99 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_IsNullOrEmpty_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_IsNullOrEmpty_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.api.multimap; +package org.assertj.eclipse.collections.test.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.api.SoftAssertions; -import org.assertj.eclipse.collections.api.multimap.MultimapAssert; +import org.assertj.eclipse.collections.SoftAssertions; +import org.assertj.eclipse.collections.multimap.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,7 +28,7 @@ class MultimapAssert_IsNullOrEmpty_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") void passesEmptyMultimap(Multimap actual) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).isNullOrEmpty()); } @@ -39,7 +39,7 @@ void passesNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") void failsNotNullOrEmpty(Multimap actual) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).isNullOrEmpty()) @@ -47,7 +47,7 @@ void failsNotNullOrEmpty(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") void softAssertionPassesEmpty(Multimap actual) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).isNullOrEmpty()); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapTestData.java b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapTestData.java similarity index 99% rename from src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapTestData.java rename to src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapTestData.java index 4bcdff7..5ffc0e0 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapTestData.java +++ b/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapTestData.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.api.multimap; +package org.assertj.eclipse.collections.test.multimap; import org.eclipse.collections.api.factory.Bags; import org.eclipse.collections.api.factory.Lists; From 7079823db2eab245c2522a07888770ff75131174 Mon Sep 17 00:00:00 2001 From: Matt Bertolini Date: Tue, 14 Apr 2026 07:50:22 -0400 Subject: [PATCH 2/2] Make package structure match assertj conventions --- src/main/java/module-info.java | 3 +-- .../collections/{ => api}/Assertions.java | 3 +-- .../collections/{ => api}/BDDAssertions.java | 3 +-- ...ipseCollectionsSoftAssertionsProvider.java | 3 +-- .../{multimap => api}/MultimapAssert.java | 2 +- .../collections/{ => api}/SoftAssertions.java | 2 +- src/test/java/module-info.java | 2 +- .../MultimapAssert_ContainsEntry_Test.java | 14 +++++----- .../MultimapAssert_ContainsKeys_Test.java | 14 +++++----- .../MultimapAssert_ContainsOnly_Test.java | 26 +++++++++---------- .../MultimapAssert_ContainsValues_Test.java | 14 +++++----- .../MultimapAssert_Contains_Test.java | 6 ++--- ...ssert_HasDistinctSizeGreaterThan_Test.java | 16 ++++++------ .../MultimapAssert_HasDistinctSize_Test.java | 12 ++++----- .../MultimapAssert_HasKeySatisfying_Test.java | 12 ++++----- .../MultimapAssert_HasSizeBetween_Test.java | 20 +++++++------- ...ultimapAssert_HasSizeGreaterThan_Test.java | 16 ++++++------ ...pAssert_HasSizeLessThanOrEqualTo_Test.java | 14 +++++----- .../MultimapAssert_HasSizeLessThan_Test.java | 14 +++++----- .../multimap/MultimapAssert_HasSize_Test.java | 12 ++++----- ...ultimapAssert_HasValueSatisfying_Test.java | 6 ++--- .../multimap/MultimapAssert_IsEmpty_Test.java | 12 ++++----- .../MultimapAssert_IsNotEmpty_Test.java | 12 ++++----- .../MultimapAssert_IsNullOrEmpty_Test.java | 12 ++++----- .../multimap/MultimapTestData.java | 2 +- 25 files changed, 124 insertions(+), 128 deletions(-) rename src/main/java/org/assertj/eclipse/collections/{ => api}/Assertions.java (93%) rename src/main/java/org/assertj/eclipse/collections/{ => api}/BDDAssertions.java (93%) rename src/main/java/org/assertj/eclipse/collections/{ => api}/EclipseCollectionsSoftAssertionsProvider.java (93%) rename src/main/java/org/assertj/eclipse/collections/{multimap => api}/MultimapAssert.java (99%) rename src/main/java/org/assertj/eclipse/collections/{ => api}/SoftAssertions.java (97%) rename src/test/java/org/assertj/eclipse/collections/{test => api}/multimap/MultimapAssert_ContainsEntry_Test.java (80%) rename src/test/java/org/assertj/eclipse/collections/{test => api}/multimap/MultimapAssert_ContainsKeys_Test.java (80%) rename src/test/java/org/assertj/eclipse/collections/{test => api}/multimap/MultimapAssert_ContainsOnly_Test.java (86%) rename src/test/java/org/assertj/eclipse/collections/{test => api}/multimap/MultimapAssert_ContainsValues_Test.java (81%) rename src/test/java/org/assertj/eclipse/collections/{test => api}/multimap/MultimapAssert_Contains_Test.java (96%) rename src/test/java/org/assertj/eclipse/collections/{test => api}/multimap/MultimapAssert_HasDistinctSizeGreaterThan_Test.java (80%) rename src/test/java/org/assertj/eclipse/collections/{test => api}/multimap/MultimapAssert_HasDistinctSize_Test.java (80%) rename src/test/java/org/assertj/eclipse/collections/{test => api}/multimap/MultimapAssert_HasKeySatisfying_Test.java (82%) rename src/test/java/org/assertj/eclipse/collections/{test => api}/multimap/MultimapAssert_HasSizeBetween_Test.java (78%) rename src/test/java/org/assertj/eclipse/collections/{test => api}/multimap/MultimapAssert_HasSizeGreaterThan_Test.java (79%) rename src/test/java/org/assertj/eclipse/collections/{test => api}/multimap/MultimapAssert_HasSizeLessThanOrEqualTo_Test.java (79%) rename src/test/java/org/assertj/eclipse/collections/{test => api}/multimap/MultimapAssert_HasSizeLessThan_Test.java (80%) rename src/test/java/org/assertj/eclipse/collections/{test => api}/multimap/MultimapAssert_HasSize_Test.java (79%) rename src/test/java/org/assertj/eclipse/collections/{test => api}/multimap/MultimapAssert_HasValueSatisfying_Test.java (95%) rename src/test/java/org/assertj/eclipse/collections/{test => api}/multimap/MultimapAssert_IsEmpty_Test.java (79%) rename src/test/java/org/assertj/eclipse/collections/{test => api}/multimap/MultimapAssert_IsNotEmpty_Test.java (79%) rename src/test/java/org/assertj/eclipse/collections/{test => api}/multimap/MultimapAssert_IsNullOrEmpty_Test.java (80%) rename src/test/java/org/assertj/eclipse/collections/{test => api}/multimap/MultimapTestData.java (99%) diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index edf51e5..0b57f5a 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -17,8 +17,7 @@ * Main AssertJ Eclipse Collections Module */ module org.assertj.eclipse.collections { - exports org.assertj.eclipse.collections; - exports org.assertj.eclipse.collections.multimap; + exports org.assertj.eclipse.collections.api; exports org.assertj.eclipse.collections.error; requires org.assertj.core; diff --git a/src/main/java/org/assertj/eclipse/collections/Assertions.java b/src/main/java/org/assertj/eclipse/collections/api/Assertions.java similarity index 93% rename from src/main/java/org/assertj/eclipse/collections/Assertions.java rename to src/main/java/org/assertj/eclipse/collections/api/Assertions.java index 0a7be18..42c7d79 100644 --- a/src/main/java/org/assertj/eclipse/collections/Assertions.java +++ b/src/main/java/org/assertj/eclipse/collections/api/Assertions.java @@ -13,10 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections; +package org.assertj.eclipse.collections.api; import org.assertj.core.util.CheckReturnValue; -import org.assertj.eclipse.collections.multimap.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; /** diff --git a/src/main/java/org/assertj/eclipse/collections/BDDAssertions.java b/src/main/java/org/assertj/eclipse/collections/api/BDDAssertions.java similarity index 93% rename from src/main/java/org/assertj/eclipse/collections/BDDAssertions.java rename to src/main/java/org/assertj/eclipse/collections/api/BDDAssertions.java index afdd80c..f269f74 100644 --- a/src/main/java/org/assertj/eclipse/collections/BDDAssertions.java +++ b/src/main/java/org/assertj/eclipse/collections/api/BDDAssertions.java @@ -13,10 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections; +package org.assertj.eclipse.collections.api; import org.assertj.core.util.CheckReturnValue; -import org.assertj.eclipse.collections.multimap.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; /** diff --git a/src/main/java/org/assertj/eclipse/collections/EclipseCollectionsSoftAssertionsProvider.java b/src/main/java/org/assertj/eclipse/collections/api/EclipseCollectionsSoftAssertionsProvider.java similarity index 93% rename from src/main/java/org/assertj/eclipse/collections/EclipseCollectionsSoftAssertionsProvider.java rename to src/main/java/org/assertj/eclipse/collections/api/EclipseCollectionsSoftAssertionsProvider.java index b4116ce..cc830ed 100644 --- a/src/main/java/org/assertj/eclipse/collections/EclipseCollectionsSoftAssertionsProvider.java +++ b/src/main/java/org/assertj/eclipse/collections/api/EclipseCollectionsSoftAssertionsProvider.java @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections; +package org.assertj.eclipse.collections.api; import org.assertj.core.api.SoftAssertionsProvider; import org.assertj.core.util.CheckReturnValue; -import org.assertj.eclipse.collections.multimap.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; /** diff --git a/src/main/java/org/assertj/eclipse/collections/multimap/MultimapAssert.java b/src/main/java/org/assertj/eclipse/collections/api/MultimapAssert.java similarity index 99% rename from src/main/java/org/assertj/eclipse/collections/multimap/MultimapAssert.java rename to src/main/java/org/assertj/eclipse/collections/api/MultimapAssert.java index aadfa2a..c98d401 100644 --- a/src/main/java/org/assertj/eclipse/collections/multimap/MultimapAssert.java +++ b/src/main/java/org/assertj/eclipse/collections/api/MultimapAssert.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.multimap; +package org.assertj.eclipse.collections.api; import static java.util.Objects.requireNonNull; import static org.assertj.core.error.ShouldBeEmpty.shouldBeEmpty; diff --git a/src/main/java/org/assertj/eclipse/collections/SoftAssertions.java b/src/main/java/org/assertj/eclipse/collections/api/SoftAssertions.java similarity index 97% rename from src/main/java/org/assertj/eclipse/collections/SoftAssertions.java rename to src/main/java/org/assertj/eclipse/collections/api/SoftAssertions.java index de55f23..13015ad 100644 --- a/src/main/java/org/assertj/eclipse/collections/SoftAssertions.java +++ b/src/main/java/org/assertj/eclipse/collections/api/SoftAssertions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections; +package org.assertj.eclipse.collections.api; import org.assertj.core.api.AbstractSoftAssertions; import org.assertj.core.api.SoftAssertionsProvider; diff --git a/src/test/java/module-info.java b/src/test/java/module-info.java index f3d2500..cf08280 100644 --- a/src/test/java/module-info.java +++ b/src/test/java/module-info.java @@ -17,7 +17,7 @@ * Test module for AssertJ Eclipse Collections */ open module org.assertj.eclipse.collections.test { - exports org.assertj.eclipse.collections.test.multimap; + exports org.assertj.eclipse.collections.api.multimap; requires org.assertj.eclipse.collections; requires org.assertj.core; diff --git a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_ContainsEntry_Test.java b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_ContainsEntry_Test.java similarity index 80% rename from src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_ContainsEntry_Test.java rename to src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_ContainsEntry_Test.java index 4be0ee8..7e54a8a 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_ContainsEntry_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_ContainsEntry_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.multimap; +package org.assertj.eclipse.collections.api.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.SoftAssertions; -import org.assertj.eclipse.collections.multimap.MultimapAssert; +import org.assertj.eclipse.collections.api.SoftAssertions; +import org.assertj.eclipse.collections.api.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,13 +28,13 @@ class MultimapAssert_ContainsEntry_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps") void passes(Multimap actual) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).containsEntry("ENT", "Reed")); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#emptyMultimaps") void failsEmpty(Multimap actual) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).containsEntry("ENT", "Reed")) @@ -51,7 +51,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps") void failsMissingEntry(Multimap actual) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).containsEntry("VOY", "Kes")) @@ -61,7 +61,7 @@ void failsMissingEntry(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps") void softAssertionPasses(Multimap actual) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).containsEntry("ENT", "Reed")); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_ContainsKeys_Test.java b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_ContainsKeys_Test.java similarity index 80% rename from src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_ContainsKeys_Test.java rename to src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_ContainsKeys_Test.java index 4f22990..eb7cccd 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_ContainsKeys_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_ContainsKeys_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.multimap; +package org.assertj.eclipse.collections.api.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.SoftAssertions; -import org.assertj.eclipse.collections.multimap.MultimapAssert; +import org.assertj.eclipse.collections.api.SoftAssertions; +import org.assertj.eclipse.collections.api.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,13 +28,13 @@ class MultimapAssert_ContainsKeys_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps") void passes(Multimap actual) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).containsKeys("TOS", "TNG", "DS9")); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#emptyMultimaps") void failsEmpty(Multimap actual) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).containsKeys("TOS", "TNG", "DS9")) @@ -44,7 +44,7 @@ void failsEmpty(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps") void failsMissingKey(Multimap actual) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).containsKeys("DIS")) @@ -61,7 +61,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps") void softAssertionPasses(Multimap actual) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).containsKeys("TOS", "TNG", "DS9")); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_ContainsOnly_Test.java b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_ContainsOnly_Test.java similarity index 86% rename from src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_ContainsOnly_Test.java rename to src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_ContainsOnly_Test.java index 05d060c..029fa7a 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_ContainsOnly_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_ContainsOnly_Test.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.multimap; +package org.assertj.eclipse.collections.api.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; @@ -21,8 +21,8 @@ import java.util.Map; -import org.assertj.eclipse.collections.SoftAssertions; -import org.assertj.eclipse.collections.multimap.MultimapAssert; +import org.assertj.eclipse.collections.api.SoftAssertions; +import org.assertj.eclipse.collections.api.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.eclipse.collections.api.tuple.Pair; import org.junit.jupiter.api.Test; @@ -32,7 +32,7 @@ class MultimapAssert_ContainsOnly_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#shipMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#shipMultimaps") void passesWithPairs(Multimap actual) { Pair[] exactMatchPairs = new Pair[]{ pair("TNG", "Enterprise"), @@ -44,7 +44,7 @@ void passesWithPairs(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#shipMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#shipMultimaps") void passesWithEntries(Multimap actual) { Map.Entry[] exactMatchEntries = new Map.Entry[]{ pair("TNG", "Enterprise").toEntry(), @@ -56,7 +56,7 @@ void passesWithEntries(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#shipMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#shipMultimaps") void failsWhenAdditionalKeysOrValuesExistWithPair(Multimap actual) { Pair[] partialMatchMissingPairs = new Pair[]{ pair("TNG", "Enterprise"), @@ -70,7 +70,7 @@ void failsWhenAdditionalKeysOrValuesExistWithPair(Multimap actua } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#shipMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#shipMultimaps") void failsWhenAdditionalKeysOrValuesExistWithEntry(Multimap actual) { Map.Entry[] partialMatchMissingEntries = new Map.Entry[]{ pair("TNG", "Enterprise").toEntry(), @@ -84,7 +84,7 @@ void failsWhenAdditionalKeysOrValuesExistWithEntry(Multimap actu } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#shipMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#shipMultimaps") void failsWhenEntryIsMissingWithPair(Multimap actual) { Pair[] partialMatchExtraPairs = new Pair[]{ pair("TOS", "Enterprise"), @@ -100,7 +100,7 @@ void failsWhenEntryIsMissingWithPair(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#shipMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#shipMultimaps") void failsWhenEntryIsMissingWithEntry(Multimap actual) { Map.Entry[] partialMatchExtraEntries = new Map.Entry[]{ pair("TOS", "Enterprise").toEntry(), @@ -116,7 +116,7 @@ void failsWhenEntryIsMissingWithEntry(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#emptyMultimaps") void failsForEmptyMultimapWithPair(Multimap actual) { Pair[] exactMatchPairs = new Pair[]{ pair("TNG", "Enterprise"), @@ -129,7 +129,7 @@ void failsForEmptyMultimapWithPair(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#emptyMultimaps") void failsForEmptyMultimapWithEntry(Multimap actual) { Map.Entry[] exactMatchEntries = new Map.Entry[]{ pair("TNG", "Enterprise").toEntry(), @@ -164,7 +164,7 @@ void failsForNullMultimapWithEntry() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#shipMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#shipMultimaps") void softAssertionPassesWithPairs(Multimap actual) { Pair[] exactMatchPairs = new Pair[]{ pair("TNG", "Enterprise"), @@ -176,7 +176,7 @@ void softAssertionPassesWithPairs(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#shipMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#shipMultimaps") void softAssertionPassesWithEntries(Multimap actual) { Map.Entry[] exactMatchEntries = new Map.Entry[]{ pair("TNG", "Enterprise").toEntry(), diff --git a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_ContainsValues_Test.java b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_ContainsValues_Test.java similarity index 81% rename from src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_ContainsValues_Test.java rename to src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_ContainsValues_Test.java index 9e4054a..8dcb8ac 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_ContainsValues_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_ContainsValues_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.multimap; +package org.assertj.eclipse.collections.api.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.SoftAssertions; -import org.assertj.eclipse.collections.multimap.MultimapAssert; +import org.assertj.eclipse.collections.api.SoftAssertions; +import org.assertj.eclipse.collections.api.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,13 +28,13 @@ class MultimapAssert_ContainsValues_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps") void passes(Multimap actual) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).containsValues("Kirk", "Picard", "Sisko", "Janeway", "Archer")); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#emptyMultimaps") void failsEmpty(Multimap actual) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).containsValues("Kirk", "Picard", "Sisko", "Janeway", "Archer")) @@ -44,7 +44,7 @@ void failsEmpty(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps") void failsMissingValue(Multimap actual) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).containsValues("Kes")) @@ -61,7 +61,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps") void softAssertionPasses(Multimap actual) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).containsValues("Kirk", "Picard", "Sisko", "Janeway", "Archer")); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_Contains_Test.java b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_Contains_Test.java similarity index 96% rename from src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_Contains_Test.java rename to src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_Contains_Test.java index 0af8545..afaccab 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_Contains_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_Contains_Test.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.multimap; +package org.assertj.eclipse.collections.api.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; @@ -23,8 +23,8 @@ import java.util.Map; import java.util.stream.Stream; -import org.assertj.eclipse.collections.SoftAssertions; -import org.assertj.eclipse.collections.multimap.MultimapAssert; +import org.assertj.eclipse.collections.api.SoftAssertions; +import org.assertj.eclipse.collections.api.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.eclipse.collections.api.tuple.Pair; import org.eclipse.collections.impl.tuple.Tuples; diff --git a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasDistinctSizeGreaterThan_Test.java b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasDistinctSizeGreaterThan_Test.java similarity index 80% rename from src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasDistinctSizeGreaterThan_Test.java rename to src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasDistinctSizeGreaterThan_Test.java index b8abc6e..f13651a 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasDistinctSizeGreaterThan_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasDistinctSizeGreaterThan_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.multimap; +package org.assertj.eclipse.collections.api.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.SoftAssertions; -import org.assertj.eclipse.collections.multimap.MultimapAssert; +import org.assertj.eclipse.collections.api.SoftAssertions; +import org.assertj.eclipse.collections.api.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,13 +28,13 @@ class MultimapAssert_HasDistinctSizeGreaterThan_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#distinctSizeLowerBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#distinctSizeLowerBoundaryTestData") void passesGreaterThan(Multimap actual, int lowerBoundary) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).hasDistinctSizeGreaterThan(lowerBoundary)); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#distinctSizeUpperBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#distinctSizeUpperBoundaryTestData") void failsLesser(Multimap actual, int upperBoundary) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasDistinctSizeGreaterThan(upperBoundary)) @@ -43,7 +43,7 @@ void failsLesser(Multimap actual, int upperBoundary) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#distinctSizeEqualsTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#distinctSizeEqualsTestData") void failsEquals(Multimap actual, int equalsBoundary) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasDistinctSizeGreaterThan(equalsBoundary)) @@ -60,7 +60,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#emptyMultimaps") void failsEmptyMultimap(Multimap actual) { int lowerBoundary = 2; // Using the same value as in distinctSizeLowerBoundaryTestData assertThatExceptionOfType(AssertionError.class) @@ -69,7 +69,7 @@ void failsEmptyMultimap(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#distinctSizeLowerBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#distinctSizeLowerBoundaryTestData") void softAssertionPasses(Multimap actual, int lowerBoundary) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).hasDistinctSizeGreaterThan(lowerBoundary)); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasDistinctSize_Test.java b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasDistinctSize_Test.java similarity index 80% rename from src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasDistinctSize_Test.java rename to src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasDistinctSize_Test.java index c9351ef..0e2d0b8 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasDistinctSize_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasDistinctSize_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.multimap; +package org.assertj.eclipse.collections.api.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.SoftAssertions; -import org.assertj.eclipse.collections.multimap.MultimapAssert; +import org.assertj.eclipse.collections.api.SoftAssertions; +import org.assertj.eclipse.collections.api.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,13 +28,13 @@ class MultimapAssert_HasDistinctSize_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#distinctSizeEqualsTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#distinctSizeEqualsTestData") void passes(Multimap actual, int expectedSize) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).hasDistinctSize(expectedSize)); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimapsWithExpectedDistinctSize") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#emptyMultimapsWithExpectedDistinctSize") void failsEmpty(Multimap actual, int expectedSize) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasDistinctSize(expectedSize)) @@ -50,7 +50,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#distinctSizeEqualsTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#distinctSizeEqualsTestData") void softAssertionPasses(Multimap actual, int expectedSize) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).hasDistinctSize(expectedSize)); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasKeySatisfying_Test.java b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasKeySatisfying_Test.java similarity index 82% rename from src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasKeySatisfying_Test.java rename to src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasKeySatisfying_Test.java index 98c2eb7..16d03e3 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasKeySatisfying_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasKeySatisfying_Test.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.multimap; +package org.assertj.eclipse.collections.api.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; import org.assertj.core.api.Condition; -import org.assertj.eclipse.collections.SoftAssertions; -import org.assertj.eclipse.collections.multimap.MultimapAssert; +import org.assertj.eclipse.collections.api.SoftAssertions; +import org.assertj.eclipse.collections.api.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -32,13 +32,13 @@ class MultimapAssert_HasKeySatisfying_Test { private static final Condition FAILING_CONDITION = new Condition<>("DIS"::equals, "key equals DIS"); @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps") void passesKeySatisfying(Multimap actual) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).hasKeySatisfying(PASSING_CONDITION)); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps") void failsKeyNotSatisfying(Multimap actual) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasKeySatisfying(FAILING_CONDITION)) @@ -53,7 +53,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps") void softAssertionPasses(Multimap actual) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).hasKeySatisfying(PASSING_CONDITION)); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSizeBetween_Test.java b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasSizeBetween_Test.java similarity index 78% rename from src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSizeBetween_Test.java rename to src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasSizeBetween_Test.java index e5de467..a1bc19d 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSizeBetween_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasSizeBetween_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.multimap; +package org.assertj.eclipse.collections.api.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.SoftAssertions; -import org.assertj.eclipse.collections.multimap.MultimapAssert; +import org.assertj.eclipse.collections.api.SoftAssertions; +import org.assertj.eclipse.collections.api.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,25 +28,25 @@ class MultimapAssert_HasSizeBetween_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeBetweenTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#sizeBetweenTestData") void passesSizeBetween(Multimap actual, int lowerBoundary, int upperBoundary) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).hasSizeBetween(lowerBoundary, upperBoundary)); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeBetweenInclusiveUpperTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#sizeBetweenInclusiveUpperTestData") void passesSizeBetweenInclusiveUpper(Multimap actual, int lowerBoundary, int upperBoundary) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).hasSizeBetween(lowerBoundary, upperBoundary)); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeBetweenInclusiveLowerTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#sizeBetweenInclusiveLowerTestData") void passesSizeBetweenInclusiveLower(Multimap actual, int lowerBoundary, int upperBoundary) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).hasSizeBetween(lowerBoundary, upperBoundary)); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeBelowLowerBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#sizeBelowLowerBoundaryTestData") void failsSizeFallsBelowLowerBoundary(Multimap actual, int lowerBoundary, int upperBoundary) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasSizeBetween(lowerBoundary, upperBoundary)) @@ -54,7 +54,7 @@ void failsSizeFallsBelowLowerBoundary(Multimap actual, int lower } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeAboveUpperBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#sizeAboveUpperBoundaryTestData") void failsSizeFallsAboveUpperBoundary(Multimap actual, int lowerBoundary, int upperBoundary) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasSizeBetween(lowerBoundary, upperBoundary)) @@ -69,7 +69,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#emptyMultimaps") void failsEmptyMultimap(Multimap actual) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasSizeBetween(25, 50)) @@ -77,7 +77,7 @@ void failsEmptyMultimap(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeBetweenTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#sizeBetweenTestData") void softAssertionPasses(Multimap actual, int lowerBoundary, int upperBoundary) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).hasSizeBetween(lowerBoundary, upperBoundary)); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSizeGreaterThan_Test.java b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasSizeGreaterThan_Test.java similarity index 79% rename from src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSizeGreaterThan_Test.java rename to src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasSizeGreaterThan_Test.java index 7ba00f0..729f06b 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSizeGreaterThan_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasSizeGreaterThan_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.multimap; +package org.assertj.eclipse.collections.api.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.SoftAssertions; -import org.assertj.eclipse.collections.multimap.MultimapAssert; +import org.assertj.eclipse.collections.api.SoftAssertions; +import org.assertj.eclipse.collections.api.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,13 +28,13 @@ class MultimapAssert_HasSizeGreaterThan_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeLowerBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#sizeLowerBoundaryTestData") void passesGreaterThan(Multimap actual, int lowerBoundary) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).hasSizeGreaterThan(lowerBoundary)); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeUpperBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#sizeUpperBoundaryTestData") void failsLesser(Multimap actual, int upperBoundary) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasSizeGreaterThan(upperBoundary)) @@ -43,7 +43,7 @@ void failsLesser(Multimap actual, int upperBoundary) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeEqualsTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#sizeEqualsTestData") void failsEquals(Multimap actual, int equalsBoundary) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasSizeGreaterThan(equalsBoundary)) @@ -59,7 +59,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#emptyMultimaps") void failsEmptyMultimap(Multimap actual) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasSizeGreaterThan(5)) @@ -67,7 +67,7 @@ void failsEmptyMultimap(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeLowerBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#sizeLowerBoundaryTestData") void softAssertionPasses(Multimap actual, int lowerBoundary) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).hasSizeGreaterThan(lowerBoundary)); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSizeLessThanOrEqualTo_Test.java b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasSizeLessThanOrEqualTo_Test.java similarity index 79% rename from src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSizeLessThanOrEqualTo_Test.java rename to src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasSizeLessThanOrEqualTo_Test.java index 9e55953..02b4123 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSizeLessThanOrEqualTo_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasSizeLessThanOrEqualTo_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.multimap; +package org.assertj.eclipse.collections.api.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.SoftAssertions; -import org.assertj.eclipse.collections.multimap.MultimapAssert; +import org.assertj.eclipse.collections.api.SoftAssertions; +import org.assertj.eclipse.collections.api.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,19 +28,19 @@ class MultimapAssert_HasSizeLessThanOrEqualTo_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeUpperBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#sizeUpperBoundaryTestData") void passesLessThan(Multimap actual, int upperBoundary) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).hasSizeLessThanOrEqualTo(upperBoundary)); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeEqualsTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#sizeEqualsTestData") void passesEqual(Multimap actual, int equalsBoundary) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).hasSizeLessThanOrEqualTo(equalsBoundary)); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeLowerBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#sizeLowerBoundaryTestData") void failsGreater(Multimap actual, int lowerBoundary) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasSizeLessThanOrEqualTo(lowerBoundary)) @@ -56,7 +56,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeUpperBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#sizeUpperBoundaryTestData") void softAssertionPasses(Multimap actual, int upperBoundary) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).hasSizeLessThanOrEqualTo(upperBoundary)); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSizeLessThan_Test.java b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasSizeLessThan_Test.java similarity index 80% rename from src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSizeLessThan_Test.java rename to src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasSizeLessThan_Test.java index a9066ce..9cdcb61 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSizeLessThan_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasSizeLessThan_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.multimap; +package org.assertj.eclipse.collections.api.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.SoftAssertions; -import org.assertj.eclipse.collections.multimap.MultimapAssert; +import org.assertj.eclipse.collections.api.SoftAssertions; +import org.assertj.eclipse.collections.api.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,13 +28,13 @@ class MultimapAssert_HasSizeLessThan_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeUpperBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#sizeUpperBoundaryTestData") void passesLessThan(Multimap actual, int upperBoundary) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).hasSizeLessThan(upperBoundary)); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeLowerBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#sizeLowerBoundaryTestData") void failsGreater(Multimap actual, int lowerBoundary) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasSizeLessThan(lowerBoundary)) @@ -43,7 +43,7 @@ void failsGreater(Multimap actual, int lowerBoundary) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeEqualsTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#sizeEqualsTestData") void failsEquals(Multimap actual, int equalsBoundary) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasSizeLessThan(equalsBoundary)) @@ -59,7 +59,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeUpperBoundaryTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#sizeUpperBoundaryTestData") void softAssertionPasses(Multimap actual, int upperBoundary) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).hasSizeLessThan(upperBoundary)); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSize_Test.java b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasSize_Test.java similarity index 79% rename from src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSize_Test.java rename to src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasSize_Test.java index eab40b8..f9e121d 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasSize_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasSize_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.multimap; +package org.assertj.eclipse.collections.api.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.SoftAssertions; -import org.assertj.eclipse.collections.multimap.MultimapAssert; +import org.assertj.eclipse.collections.api.SoftAssertions; +import org.assertj.eclipse.collections.api.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,13 +28,13 @@ class MultimapAssert_HasSize_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeEqualsTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#sizeEqualsTestData") void passes(Multimap actual, int expectedSize) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).hasSize(expectedSize)); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimapsWithExpectedSize") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#emptyMultimapsWithExpectedSize") void failsEmpty(Multimap actual, int expectedSize) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).hasSize(expectedSize)) @@ -49,7 +49,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#sizeEqualsTestData") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#sizeEqualsTestData") void softAssertionPasses(Multimap actual, int expectedSize) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).hasSize(expectedSize)); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasValueSatisfying_Test.java b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasValueSatisfying_Test.java similarity index 95% rename from src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasValueSatisfying_Test.java rename to src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasValueSatisfying_Test.java index bba272b..66b469c 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_HasValueSatisfying_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_HasValueSatisfying_Test.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.multimap; +package org.assertj.eclipse.collections.api.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; @@ -22,8 +22,8 @@ import java.util.stream.Stream; import org.assertj.core.api.Condition; -import org.assertj.eclipse.collections.SoftAssertions; -import org.assertj.eclipse.collections.multimap.MultimapAssert; +import org.assertj.eclipse.collections.api.SoftAssertions; +import org.assertj.eclipse.collections.api.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_IsEmpty_Test.java b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_IsEmpty_Test.java similarity index 79% rename from src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_IsEmpty_Test.java rename to src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_IsEmpty_Test.java index a63bd6b..c9951ab 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_IsEmpty_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_IsEmpty_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.multimap; +package org.assertj.eclipse.collections.api.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.SoftAssertions; -import org.assertj.eclipse.collections.multimap.MultimapAssert; +import org.assertj.eclipse.collections.api.SoftAssertions; +import org.assertj.eclipse.collections.api.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,13 +28,13 @@ class MultimapAssert_IsEmpty_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#emptyMultimaps") void passes(Multimap actual) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).isEmpty()); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps") void failsNotEmpty(Multimap actual) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).isEmpty()) @@ -49,7 +49,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#emptyMultimaps") void softAssertionPasses(Multimap actual) { assertThatNoException().isThrownBy(() -> SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).isEmpty())); diff --git a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_IsNotEmpty_Test.java b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_IsNotEmpty_Test.java similarity index 79% rename from src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_IsNotEmpty_Test.java rename to src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_IsNotEmpty_Test.java index 29325d7..f2a5057 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_IsNotEmpty_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_IsNotEmpty_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.multimap; +package org.assertj.eclipse.collections.api.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.SoftAssertions; -import org.assertj.eclipse.collections.multimap.MultimapAssert; +import org.assertj.eclipse.collections.api.SoftAssertions; +import org.assertj.eclipse.collections.api.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,13 +28,13 @@ class MultimapAssert_IsNotEmpty_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps") void passesNotEmpty(Multimap actual) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).isNotEmpty()); } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#emptyMultimaps") void failsEmpty(Multimap actual) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).isNotEmpty()) @@ -49,7 +49,7 @@ void failsNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps") void softAssertionPasses(Multimap actual) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).isNotEmpty()); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_IsNullOrEmpty_Test.java b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_IsNullOrEmpty_Test.java similarity index 80% rename from src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_IsNullOrEmpty_Test.java rename to src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_IsNullOrEmpty_Test.java index fc51d99..c8ca533 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapAssert_IsNullOrEmpty_Test.java +++ b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_IsNullOrEmpty_Test.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.multimap; +package org.assertj.eclipse.collections.api.multimap; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; -import org.assertj.eclipse.collections.SoftAssertions; -import org.assertj.eclipse.collections.multimap.MultimapAssert; +import org.assertj.eclipse.collections.api.SoftAssertions; +import org.assertj.eclipse.collections.api.MultimapAssert; import org.eclipse.collections.api.multimap.Multimap; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -28,7 +28,7 @@ class MultimapAssert_IsNullOrEmpty_Test { @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#emptyMultimaps") void passesEmptyMultimap(Multimap actual) { assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).isNullOrEmpty()); } @@ -39,7 +39,7 @@ void passesNullMultimap() { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#nonEmptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps") void failsNotNullOrEmpty(Multimap actual) { assertThatExceptionOfType(AssertionError.class) .isThrownBy(() -> new MultimapAssert<>(actual).isNullOrEmpty()) @@ -47,7 +47,7 @@ void failsNotNullOrEmpty(Multimap actual) { } @ParameterizedTest - @MethodSource("org.assertj.eclipse.collections.test.multimap.MultimapTestData#emptyMultimaps") + @MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#emptyMultimaps") void softAssertionPassesEmpty(Multimap actual) { SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).isNullOrEmpty()); } diff --git a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapTestData.java b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapTestData.java similarity index 99% rename from src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapTestData.java rename to src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapTestData.java index 5ffc0e0..7e56513 100644 --- a/src/test/java/org/assertj/eclipse/collections/test/multimap/MultimapTestData.java +++ b/src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapTestData.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.assertj.eclipse.collections.test.multimap; +package org.assertj.eclipse.collections.api.multimap; import org.eclipse.collections.api.factory.Bags; import org.eclipse.collections.api.factory.Lists;