Skip to content

Commit 065e00f

Browse files
mattbertolinimattbertolini
authored
Make package structure match AssertJ convention (#15)
1 parent 0cd85a6 commit 065e00f

24 files changed

Lines changed: 102 additions & 106 deletions

‎src/main/java/module-info.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919
module org.assertj.eclipse.collections {
2020
exports org.assertj.eclipse.collections.api;
21-
exports org.assertj.eclipse.collections.api.multimap;
2221
exports org.assertj.eclipse.collections.error;
2322

2423
requires org.assertj.core;

‎src/main/java/org/assertj/eclipse/collections/api/Assertions.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package org.assertj.eclipse.collections.api;
1717

1818
import org.assertj.core.util.CheckReturnValue;
19-
import org.assertj.eclipse.collections.api.multimap.MultimapAssert;
2019
import org.eclipse.collections.api.multimap.Multimap;
2120

2221
/**

‎src/main/java/org/assertj/eclipse/collections/api/BDDAssertions.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package org.assertj.eclipse.collections.api;
1717

1818
import org.assertj.core.util.CheckReturnValue;
19-
import org.assertj.eclipse.collections.api.multimap.MultimapAssert;
2019
import org.eclipse.collections.api.multimap.Multimap;
2120

2221
/**

‎src/main/java/org/assertj/eclipse/collections/api/EclipseCollectionsSoftAssertionsProvider.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import org.assertj.core.api.SoftAssertionsProvider;
1919
import org.assertj.core.util.CheckReturnValue;
20-
import org.assertj.eclipse.collections.api.multimap.MultimapAssert;
2120
import org.eclipse.collections.api.multimap.Multimap;
2221

2322
/**

src/main/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert.java renamed to src/main/java/org/assertj/eclipse/collections/api/MultimapAssert.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.assertj.eclipse.collections.api.multimap;
16+
package org.assertj.eclipse.collections.api;
1717

1818
import static java.util.Objects.requireNonNull;
1919
import static org.assertj.core.error.ShouldBeEmpty.shouldBeEmpty;

‎src/test/java/module-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* Test module for AssertJ Eclipse Collections
1818
*/
1919
open module org.assertj.eclipse.collections.test {
20-
exports org.assertj.eclipse.collections.test.api.multimap;
20+
exports org.assertj.eclipse.collections.api.multimap;
2121

2222
requires org.assertj.eclipse.collections;
2323
requires org.assertj.core;

src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_ContainsEntry_Test.java renamed to src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_ContainsEntry_Test.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.assertj.eclipse.collections.test.api.multimap;
16+
package org.assertj.eclipse.collections.api.multimap;
1717

1818
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
1919
import static org.assertj.core.api.Assertions.assertThatNoException;
2020

2121
import org.assertj.eclipse.collections.api.SoftAssertions;
22-
import org.assertj.eclipse.collections.api.multimap.MultimapAssert;
22+
import org.assertj.eclipse.collections.api.MultimapAssert;
2323
import org.eclipse.collections.api.multimap.Multimap;
2424
import org.junit.jupiter.api.Test;
2525
import org.junit.jupiter.params.ParameterizedTest;
@@ -28,13 +28,13 @@
2828
class MultimapAssert_ContainsEntry_Test {
2929

3030
@ParameterizedTest
31-
@MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps")
31+
@MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps")
3232
void passes(Multimap<String, String> actual) {
3333
assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).containsEntry("ENT", "Reed"));
3434
}
3535

3636
@ParameterizedTest
37-
@MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#emptyMultimaps")
37+
@MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#emptyMultimaps")
3838
void failsEmpty(Multimap<String, String> actual) {
3939
assertThatExceptionOfType(AssertionError.class)
4040
.isThrownBy(() -> new MultimapAssert<>(actual).containsEntry("ENT", "Reed"))
@@ -51,7 +51,7 @@ void failsNullMultimap() {
5151
}
5252

5353
@ParameterizedTest
54-
@MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps")
54+
@MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps")
5555
void failsMissingEntry(Multimap<String, String> actual) {
5656
assertThatExceptionOfType(AssertionError.class)
5757
.isThrownBy(() -> new MultimapAssert<>(actual).containsEntry("VOY", "Kes"))
@@ -61,7 +61,7 @@ void failsMissingEntry(Multimap<String, String> actual) {
6161
}
6262

6363
@ParameterizedTest
64-
@MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps")
64+
@MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps")
6565
void softAssertionPasses(Multimap<String, String> actual) {
6666
SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).containsEntry("ENT", "Reed"));
6767
}

src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_ContainsKeys_Test.java renamed to src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_ContainsKeys_Test.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.assertj.eclipse.collections.test.api.multimap;
16+
package org.assertj.eclipse.collections.api.multimap;
1717

1818
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
1919
import static org.assertj.core.api.Assertions.assertThatNoException;
2020

2121
import org.assertj.eclipse.collections.api.SoftAssertions;
22-
import org.assertj.eclipse.collections.api.multimap.MultimapAssert;
22+
import org.assertj.eclipse.collections.api.MultimapAssert;
2323
import org.eclipse.collections.api.multimap.Multimap;
2424
import org.junit.jupiter.api.Test;
2525
import org.junit.jupiter.params.ParameterizedTest;
@@ -28,13 +28,13 @@
2828
class MultimapAssert_ContainsKeys_Test {
2929

3030
@ParameterizedTest
31-
@MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps")
31+
@MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps")
3232
void passes(Multimap<String, String> actual) {
3333
assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).containsKeys("TOS", "TNG", "DS9"));
3434
}
3535

3636
@ParameterizedTest
37-
@MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#emptyMultimaps")
37+
@MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#emptyMultimaps")
3838
void failsEmpty(Multimap<String, String> actual) {
3939
assertThatExceptionOfType(AssertionError.class)
4040
.isThrownBy(() -> new MultimapAssert<>(actual).containsKeys("TOS", "TNG", "DS9"))
@@ -44,7 +44,7 @@ void failsEmpty(Multimap<String, String> actual) {
4444
}
4545

4646
@ParameterizedTest
47-
@MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps")
47+
@MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps")
4848
void failsMissingKey(Multimap<String, String> actual) {
4949
assertThatExceptionOfType(AssertionError.class)
5050
.isThrownBy(() -> new MultimapAssert<>(actual).containsKeys("DIS"))
@@ -61,7 +61,7 @@ void failsNullMultimap() {
6161
}
6262

6363
@ParameterizedTest
64-
@MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps")
64+
@MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps")
6565
void softAssertionPasses(Multimap<String, String> actual) {
6666
SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).containsKeys("TOS", "TNG", "DS9"));
6767
}

src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_ContainsOnly_Test.java renamed to src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_ContainsOnly_Test.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.assertj.eclipse.collections.test.api.multimap;
16+
package org.assertj.eclipse.collections.api.multimap;
1717

1818
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
1919
import static org.assertj.core.api.Assertions.assertThatNoException;
@@ -22,7 +22,7 @@
2222
import java.util.Map;
2323

2424
import org.assertj.eclipse.collections.api.SoftAssertions;
25-
import org.assertj.eclipse.collections.api.multimap.MultimapAssert;
25+
import org.assertj.eclipse.collections.api.MultimapAssert;
2626
import org.eclipse.collections.api.multimap.Multimap;
2727
import org.eclipse.collections.api.tuple.Pair;
2828
import org.junit.jupiter.api.Test;
@@ -32,7 +32,7 @@
3232
class MultimapAssert_ContainsOnly_Test {
3333

3434
@ParameterizedTest
35-
@MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#shipMultimaps")
35+
@MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#shipMultimaps")
3636
void passesWithPairs(Multimap<String, String> actual) {
3737
Pair<String, String>[] exactMatchPairs = new Pair[]{
3838
pair("TNG", "Enterprise"),
@@ -44,7 +44,7 @@ void passesWithPairs(Multimap<String, String> actual) {
4444
}
4545

4646
@ParameterizedTest
47-
@MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#shipMultimaps")
47+
@MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#shipMultimaps")
4848
void passesWithEntries(Multimap<String, String> actual) {
4949
Map.Entry<String, String>[] exactMatchEntries = new Map.Entry[]{
5050
pair("TNG", "Enterprise").toEntry(),
@@ -56,7 +56,7 @@ void passesWithEntries(Multimap<String, String> actual) {
5656
}
5757

5858
@ParameterizedTest
59-
@MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#shipMultimaps")
59+
@MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#shipMultimaps")
6060
void failsWhenAdditionalKeysOrValuesExistWithPair(Multimap<String, String> actual) {
6161
Pair<String, String>[] partialMatchMissingPairs = new Pair[]{
6262
pair("TNG", "Enterprise"),
@@ -70,7 +70,7 @@ void failsWhenAdditionalKeysOrValuesExistWithPair(Multimap<String, String> actua
7070
}
7171

7272
@ParameterizedTest
73-
@MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#shipMultimaps")
73+
@MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#shipMultimaps")
7474
void failsWhenAdditionalKeysOrValuesExistWithEntry(Multimap<String, String> actual) {
7575
Map.Entry<String, String>[] partialMatchMissingEntries = new Map.Entry[]{
7676
pair("TNG", "Enterprise").toEntry(),
@@ -84,7 +84,7 @@ void failsWhenAdditionalKeysOrValuesExistWithEntry(Multimap<String, String> actu
8484
}
8585

8686
@ParameterizedTest
87-
@MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#shipMultimaps")
87+
@MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#shipMultimaps")
8888
void failsWhenEntryIsMissingWithPair(Multimap<String, String> actual) {
8989
Pair<String, String>[] partialMatchExtraPairs = new Pair[]{
9090
pair("TOS", "Enterprise"),
@@ -100,7 +100,7 @@ void failsWhenEntryIsMissingWithPair(Multimap<String, String> actual) {
100100
}
101101

102102
@ParameterizedTest
103-
@MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#shipMultimaps")
103+
@MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#shipMultimaps")
104104
void failsWhenEntryIsMissingWithEntry(Multimap<String, String> actual) {
105105
Map.Entry<String, String>[] partialMatchExtraEntries = new Map.Entry[]{
106106
pair("TOS", "Enterprise").toEntry(),
@@ -116,7 +116,7 @@ void failsWhenEntryIsMissingWithEntry(Multimap<String, String> actual) {
116116
}
117117

118118
@ParameterizedTest
119-
@MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#emptyMultimaps")
119+
@MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#emptyMultimaps")
120120
void failsForEmptyMultimapWithPair(Multimap<String, String> actual) {
121121
Pair<String, String>[] exactMatchPairs = new Pair[]{
122122
pair("TNG", "Enterprise"),
@@ -129,7 +129,7 @@ void failsForEmptyMultimapWithPair(Multimap<String, String> actual) {
129129
}
130130

131131
@ParameterizedTest
132-
@MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#emptyMultimaps")
132+
@MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#emptyMultimaps")
133133
void failsForEmptyMultimapWithEntry(Multimap<String, String> actual) {
134134
Map.Entry<String, String>[] exactMatchEntries = new Map.Entry[]{
135135
pair("TNG", "Enterprise").toEntry(),
@@ -164,7 +164,7 @@ void failsForNullMultimapWithEntry() {
164164
}
165165

166166
@ParameterizedTest
167-
@MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#shipMultimaps")
167+
@MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#shipMultimaps")
168168
void softAssertionPassesWithPairs(Multimap<String, String> actual) {
169169
Pair<String, String>[] exactMatchPairs = new Pair[]{
170170
pair("TNG", "Enterprise"),
@@ -176,7 +176,7 @@ void softAssertionPassesWithPairs(Multimap<String, String> actual) {
176176
}
177177

178178
@ParameterizedTest
179-
@MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#shipMultimaps")
179+
@MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#shipMultimaps")
180180
void softAssertionPassesWithEntries(Multimap<String, String> actual) {
181181
Map.Entry<String, String>[] exactMatchEntries = new Map.Entry[]{
182182
pair("TNG", "Enterprise").toEntry(),

src/test/java/org/assertj/eclipse/collections/test/api/multimap/MultimapAssert_ContainsValues_Test.java renamed to src/test/java/org/assertj/eclipse/collections/api/multimap/MultimapAssert_ContainsValues_Test.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.assertj.eclipse.collections.test.api.multimap;
16+
package org.assertj.eclipse.collections.api.multimap;
1717

1818
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
1919
import static org.assertj.core.api.Assertions.assertThatNoException;
2020

2121
import org.assertj.eclipse.collections.api.SoftAssertions;
22-
import org.assertj.eclipse.collections.api.multimap.MultimapAssert;
22+
import org.assertj.eclipse.collections.api.MultimapAssert;
2323
import org.eclipse.collections.api.multimap.Multimap;
2424
import org.junit.jupiter.api.Test;
2525
import org.junit.jupiter.params.ParameterizedTest;
@@ -28,13 +28,13 @@
2828
class MultimapAssert_ContainsValues_Test {
2929

3030
@ParameterizedTest
31-
@MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps")
31+
@MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps")
3232
void passes(Multimap<String, String> actual) {
3333
assertThatNoException().isThrownBy(() -> new MultimapAssert<>(actual).containsValues("Kirk", "Picard", "Sisko", "Janeway", "Archer"));
3434
}
3535

3636
@ParameterizedTest
37-
@MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#emptyMultimaps")
37+
@MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#emptyMultimaps")
3838
void failsEmpty(Multimap<String, String> actual) {
3939
assertThatExceptionOfType(AssertionError.class)
4040
.isThrownBy(() -> new MultimapAssert<>(actual).containsValues("Kirk", "Picard", "Sisko", "Janeway", "Archer"))
@@ -44,7 +44,7 @@ void failsEmpty(Multimap<String, String> actual) {
4444
}
4545

4646
@ParameterizedTest
47-
@MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps")
47+
@MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps")
4848
void failsMissingValue(Multimap<String, String> actual) {
4949
assertThatExceptionOfType(AssertionError.class)
5050
.isThrownBy(() -> new MultimapAssert<>(actual).containsValues("Kes"))
@@ -61,7 +61,7 @@ void failsNullMultimap() {
6161
}
6262

6363
@ParameterizedTest
64-
@MethodSource("org.assertj.eclipse.collections.test.api.multimap.MultimapTestData#nonEmptyMultimaps")
64+
@MethodSource("org.assertj.eclipse.collections.api.multimap.MultimapTestData#nonEmptyMultimaps")
6565
void softAssertionPasses(Multimap<String, String> actual) {
6666
SoftAssertions.assertSoftly(softly -> softly.assertThat(actual).containsValues("Kirk", "Picard", "Sisko", "Janeway", "Archer"));
6767
}

0 commit comments

Comments
 (0)