diff --git a/assertj-guava/pom.xml b/assertj-guava/pom.xml
index 3016ae2958..8b82941d66 100644
--- a/assertj-guava/pom.xml
+++ b/assertj-guava/pom.xml
@@ -42,12 +42,6 @@
provided
true
-
-
- org.junit.jupiter
- junit-jupiter
- test
-
diff --git a/assertj-guava/src/main/java/module-info.java b/assertj-guava/src/main/java/module-info.java
new file mode 100644
index 0000000000..a9d876b510
--- /dev/null
+++ b/assertj-guava/src/main/java/module-info.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * Copyright 2012-2024 the original author or authors.
+ */
+
+/**
+ * AssertJ extension for Guava assertions.
+ */
+module org.assertj.guava {
+ requires transitive org.assertj.core;
+ requires com.google.common;
+
+ exports org.assertj.guava.api;
+ exports org.assertj.guava.data;
+ exports org.assertj.guava.error;
+ exports org.assertj.guava.util;
+}
diff --git a/assertj-tests/assertj-integration-tests/assertj-guava-module-path/pom.xml b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/pom.xml
new file mode 100644
index 0000000000..d1343ab43f
--- /dev/null
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/pom.xml
@@ -0,0 +1,40 @@
+
+
+ 4.0.0
+
+
+ org.assertj
+ assertj-integration-tests
+ 3.26.0-SNAPSHOT
+
+
+ assertj-guava-module-path
+
+ AssertJ Guava Integration Tests - Module Path
+
+
+ ${project.basedir}/../../../
+ false
+
+
+
+
+ com.google.guava
+ guava
+ 33.2.0-jre
+ test
+
+
+ org.assertj
+ assertj-guava
+ ${project.version}
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter
+ test
+
+
+
+
diff --git a/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/module-info.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/module-info.java
new file mode 100644
index 0000000000..04de42c8be
--- /dev/null
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/module-info.java
@@ -0,0 +1,18 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * Copyright 2012-2024 the original author or authors.
+ */
+open module org.assertj.test.guava {
+ requires com.google.common;
+ requires org.assertj.guava;
+ requires org.junit.jupiter.api;
+ requires org.junit.jupiter.params;
+}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/Assertions_assertThat_with_Multimap_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/Assertions_assertThat_with_Multimap_Test.java
similarity index 81%
rename from assertj-guava/src/test/java/org/assertj/guava/api/Assertions_assertThat_with_Multimap_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/Assertions_assertThat_with_Multimap_Test.java
index 898cd4e284..bc72095f73 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/Assertions_assertThat_with_Multimap_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/Assertions_assertThat_with_Multimap_Test.java
@@ -10,11 +10,12 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static org.assertj.core.api.BDDAssertions.then;
import static org.assertj.guava.api.Assertions.assertThat;
+import org.assertj.guava.api.MultimapAssert;
import org.junit.jupiter.api.Test;
import com.google.common.collect.HashMultimap;
@@ -35,14 +36,4 @@ void should_create_Assert() {
then(assertion).isNotNull();
}
- @Test
- void should_pass_actual() {
- // GIVEN
- Multimap actual = HashMultimap.create();
- // WHEN
- Multimap result = assertThat(actual).getActual();
- // THEN
- then(result).isSameAs(actual);
- }
-
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/Assertions_assertThat_with_Optional_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/Assertions_assertThat_with_Optional_Test.java
similarity index 79%
rename from assertj-guava/src/test/java/org/assertj/guava/api/Assertions_assertThat_with_Optional_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/Assertions_assertThat_with_Optional_Test.java
index 75cda156a9..4e0adbb3fb 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/Assertions_assertThat_with_Optional_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/Assertions_assertThat_with_Optional_Test.java
@@ -10,11 +10,12 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static org.assertj.core.api.BDDAssertions.then;
import static org.assertj.guava.api.Assertions.assertThat;
+import org.assertj.guava.api.OptionalAssert;
import org.junit.jupiter.api.Test;
import com.google.common.base.Optional;
@@ -22,7 +23,6 @@
/**
* @author Joel Costigliola
*/
-@SuppressWarnings("Guava")
class Assertions_assertThat_with_Optional_Test {
@Test
@@ -35,14 +35,4 @@ void should_create_Assert() {
then(assertion).isNotNull();
}
- @Test
- void should_pass_actual() {
- // GIVEN
- Optional actual = Optional.of("value");
- // WHEN
- Optional result = assertThat(actual).getActual();
- // THEN
- then(result).isSameAs(actual);
- }
-
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/Assertions_sync_with_InstanceOfAssertFactories_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/Assertions_sync_with_InstanceOfAssertFactories_Test.java
similarity index 96%
rename from assertj-guava/src/test/java/org/assertj/guava/api/Assertions_sync_with_InstanceOfAssertFactories_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/Assertions_sync_with_InstanceOfAssertFactories_Test.java
index a177baddd3..a5a5a828d9 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/Assertions_sync_with_InstanceOfAssertFactories_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/Assertions_sync_with_InstanceOfAssertFactories_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.util.stream.Collectors.toMap;
import static org.assertj.core.api.Assertions.assertThat;
@@ -34,6 +34,11 @@
import java.util.stream.Stream;
import org.assertj.core.api.InstanceOfAssertFactory;
+import org.assertj.guava.api.Assertions;
+import org.assertj.guava.api.InstanceOfAssertFactories;
+import org.assertj.guava.api.RangeAssert;
+import org.assertj.guava.api.RangeMapAssert;
+import org.assertj.guava.api.RangeSetAssert;
import org.junit.jupiter.api.Test;
/**
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/ByteSourceAssert_hasSameContentAs_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/ByteSourceAssert_hasSameContentAs_Test.java
similarity index 94%
rename from assertj-guava/src/test/java/org/assertj/guava/api/ByteSourceAssert_hasSameContentAs_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/ByteSourceAssert_hasSameContentAs_Test.java
index c00fc80f56..aa16a5464d 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/ByteSourceAssert_hasSameContentAs_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/ByteSourceAssert_hasSameContentAs_Test.java
@@ -10,13 +10,13 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static org.assertj.core.api.BDDAssertions.then;
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.guava.api.Assertions.assertThat;
import static org.assertj.guava.error.ShouldHaveSameContent.shouldHaveSameContent;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import static org.assertj.guava.tests.testkit.AssertionErrors.expectAssertionError;
import java.io.IOException;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/ByteSourceAssert_hasSize_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/ByteSourceAssert_hasSize_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/ByteSourceAssert_hasSize_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/ByteSourceAssert_hasSize_Test.java
index 7e970fd34c..788217c089 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/ByteSourceAssert_hasSize_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/ByteSourceAssert_hasSize_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/ByteSourceAssert_isEmpty_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/ByteSourceAssert_isEmpty_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/ByteSourceAssert_isEmpty_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/ByteSourceAssert_isEmpty_Test.java
index 5d0cd45b0a..cc63a452e2 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/ByteSourceAssert_isEmpty_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/ByteSourceAssert_isEmpty_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/InstanceOfAssertFactoriesTest.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/InstanceOfAssertFactoriesTest.java
similarity index 93%
rename from assertj-guava/src/test/java/org/assertj/guava/api/InstanceOfAssertFactoriesTest.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/InstanceOfAssertFactoriesTest.java
index e48ff8a992..1b6212d948 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/InstanceOfAssertFactoriesTest.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/InstanceOfAssertFactoriesTest.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.data.MapEntry.entry;
@@ -29,6 +29,15 @@
import java.io.IOException;
+import org.assertj.guava.api.Assertions;
+import org.assertj.guava.api.ByteSourceAssert;
+import org.assertj.guava.api.MultimapAssert;
+import org.assertj.guava.api.MultisetAssert;
+import org.assertj.guava.api.OptionalAssert;
+import org.assertj.guava.api.RangeAssert;
+import org.assertj.guava.api.RangeMapAssert;
+import org.assertj.guava.api.RangeSetAssert;
+import org.assertj.guava.api.TableAssert;
import org.junit.jupiter.api.Test;
import com.google.common.base.Optional;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssertBaseTest.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssertBaseTest.java
similarity index 97%
rename from assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssertBaseTest.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssertBaseTest.java
index feeff3ce3b..be15d88dd9 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssertBaseTest.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssertBaseTest.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Lists.newArrayList;
@@ -35,4 +35,4 @@ public void setUp() {
actual.putAll("Spurs", newArrayList("Tony Parker", "Tim Duncan", "Manu Ginobili"));
}
-}
\ No newline at end of file
+}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_containsAllEntriesOf_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_containsAllEntriesOf_Test.java
similarity index 92%
rename from assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_containsAllEntriesOf_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_containsAllEntriesOf_Test.java
index d64051a5f0..ef3a127350 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_containsAllEntriesOf_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_containsAllEntriesOf_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Lists.newArrayList;
import static org.assertj.core.api.Assertions.catchThrowable;
@@ -20,8 +20,8 @@
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.core.util.Lists.list;
import static org.assertj.guava.api.Assertions.assertThat;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.HashMultimap;
@@ -76,7 +76,7 @@ void should_fail_if_actual_is_null() {
// GIVEN
actual = null;
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).containsAllEntriesOf(other));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).containsAllEntriesOf(other));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -100,7 +100,7 @@ void should_fail_if_actual_does_not_contain_all_given_multimap_entries() {
other.putAll("Spurs", newArrayList("Tony Parker", "Tim Duncan", "Manu Ginobili"));
other.putAll("Warriors", newArrayList("Stephen Curry", "Klay Thompson"));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).containsAllEntriesOf(other));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).containsAllEntriesOf(other));
// THEN
then(error).hasMessage(shouldContain(actual, other,
list(entry("Warriors", "Stephen Curry"), entry("Warriors", "Klay Thompson"))).create());
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_containsKeys_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_containsKeys_Test.java
similarity index 99%
rename from assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_containsKeys_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_containsKeys_Test.java
index 5ad756b631..05565b0bdf 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_containsKeys_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_containsKeys_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_containsValues_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_containsValues_Test.java
similarity index 99%
rename from assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_containsValues_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_containsValues_Test.java
index 77a1a2804a..ae45148253 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_containsValues_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_containsValues_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_contains_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_contains_Test.java
similarity index 85%
rename from assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_contains_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_contains_Test.java
index b639154526..d28c25b5d7 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_contains_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_contains_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.util.Collections.singleton;
import static org.assertj.core.api.Assertions.catchThrowable;
@@ -20,9 +20,9 @@
import static org.assertj.core.util.Arrays.array;
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.guava.api.Assertions.assertThat;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
import org.assertj.core.data.MapEntry;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
class MultimapAssert_contains_Test extends MultimapAssertBaseTest {
@@ -38,7 +38,8 @@ void should_fail_if_actual_is_null() {
// GIVEN
actual = null;
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).contains(entry("Lakers", "Kobe Bryant")));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).contains(entry("Lakers",
+ "Kobe Bryant")));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -68,7 +69,7 @@ void should_fail_if_actual_does_not_contain_all_given_entries() {
// GIVEN
MapEntry[] entries = array(entry("Lakers", "Kobe Bryant"), entry("Spurs", "Derrick Rose"));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).contains(entries));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).contains(entries));
// THEN
then(error).hasMessage(shouldContain(actual, entries, singleton(entry("Spurs", "Derrick Rose"))).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_doesNotContainKeys_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_doesNotContainKeys_Test.java
similarity index 89%
rename from assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_doesNotContainKeys_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_doesNotContainKeys_Test.java
index f7409c14c0..c732b65a1e 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_doesNotContainKeys_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_doesNotContainKeys_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static org.assertj.core.api.Assertions.catchThrowable;
import static org.assertj.core.api.BDDAssertions.then;
@@ -18,7 +18,7 @@
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.core.util.Sets.set;
import static org.assertj.guava.api.Assertions.assertThat;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import static org.assertj.guava.tests.testkit.AssertionErrors.expectAssertionError;
import org.junit.jupiter.api.Test;
@@ -31,7 +31,8 @@ void should_fail_if_actual_is_null() {
// GIVEN
actual = null;
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).doesNotContainKeys("Nets", "Bulls", "Knicks"));
+ AssertionError error = expectAssertionError(() -> assertThat(actual).doesNotContainKeys("Nets", "Bulls",
+ "Knicks"));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -102,7 +103,8 @@ void should_fail_if_one_key_is_present() {
@Test
void should_fail_if_multiple_keys_are_present() {
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).doesNotContainKeys("Bulls", "Knicks", "Spurs"));
+ AssertionError error = expectAssertionError(() -> assertThat(actual).doesNotContainKeys("Bulls", "Knicks",
+ "Spurs"));
// THEN
then(error).hasMessage(shouldNotContainKeys(actual, set("Bulls", "Spurs")).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_hasSameEntriesAs_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_hasSameEntriesAs_Test.java
similarity index 93%
rename from assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_hasSameEntriesAs_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_hasSameEntriesAs_Test.java
index c132ca21b8..7da26a36bd 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_hasSameEntriesAs_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_hasSameEntriesAs_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static org.assertj.core.api.Assertions.catchThrowable;
import static org.assertj.core.api.BDDAssertions.entry;
@@ -19,8 +19,8 @@
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.core.util.Lists.list;
import static org.assertj.guava.api.Assertions.assertThat;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.LinkedHashMultimap;
@@ -88,7 +88,7 @@ void should_fail_if_actual_contains_entries_not_in_given_multimap() {
other.putAll("Lakers", list("Kobe Bryant", "Magic Johnson", "Kareem Abdul Jabbar"));
other.putAll("Bulls", list("Michael Jordan", "Scottie Pippen", "Derrick Rose"));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).hasSameEntriesAs(other));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).hasSameEntriesAs(other));
// THEN
then(error).hasMessage(shouldContainOnly(actual, other, null,
list(entry("Spurs", "Tony Parker"), entry("Spurs", "Tim Duncan"),
@@ -103,7 +103,7 @@ void should_fail_if_actual_does_not_contain_all_given_multimap_entries() {
other.putAll("Spurs", list("Tony Parker", "Tim Duncan", "Manu Ginobili"));
other.putAll("Warriors", list("Stephen Curry", "Klay Thompson"));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).hasSameEntriesAs(other));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).hasSameEntriesAs(other));
// THEN
then(error).hasMessage(shouldContainOnly(actual, other,
list(entry("Warriors", "Stephen Curry"), entry("Warriors", "Klay Thompson")),
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_hasSize_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_hasSize_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_hasSize_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_hasSize_Test.java
index 49a6e27bd5..44c30adfa2 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_hasSize_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_hasSize_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.catchThrowable;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_isEmpty_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_isEmpty_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_isEmpty_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_isEmpty_Test.java
index 63d3949de8..1552d7afe2 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_isEmpty_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_isEmpty_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_isNotEmpty_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_isNotEmpty_Test.java
similarity index 97%
rename from assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_isNotEmpty_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_isNotEmpty_Test.java
index 46b54500b9..643705bfc3 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/MultimapAssert_isNotEmpty_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultimapAssert_isNotEmpty_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/MultisetAssert_containsAtLeast_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultisetAssert_containsAtLeast_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/MultisetAssert_containsAtLeast_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultisetAssert_containsAtLeast_Test.java
index ac27ad152c..9a91cdeb4b 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/MultisetAssert_containsAtLeast_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultisetAssert_containsAtLeast_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/MultisetAssert_containsAtMost_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultisetAssert_containsAtMost_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/MultisetAssert_containsAtMost_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultisetAssert_containsAtMost_Test.java
index 75c39c0d40..073cdef415 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/MultisetAssert_containsAtMost_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultisetAssert_containsAtMost_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/MultisetAssert_contains_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultisetAssert_contains_Test.java
similarity index 99%
rename from assertj-guava/src/test/java/org/assertj/guava/api/MultisetAssert_contains_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultisetAssert_contains_Test.java
index 3642781f2f..c098397257 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/MultisetAssert_contains_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/MultisetAssert_contains_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/OptionalAssert_contains_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/OptionalAssert_contains_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/OptionalAssert_contains_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/OptionalAssert_contains_Test.java
index 67c9c562dd..43748526f4 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/OptionalAssert_contains_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/OptionalAssert_contains_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/OptionalAssert_extractingCharSequence_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/OptionalAssert_extractingCharSequence_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/OptionalAssert_extractingCharSequence_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/OptionalAssert_extractingCharSequence_Test.java
index 8284566a56..2d54b4f6a3 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/OptionalAssert_extractingCharSequence_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/OptionalAssert_extractingCharSequence_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/OptionalAssert_extractingValue_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/OptionalAssert_extractingValue_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/OptionalAssert_extractingValue_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/OptionalAssert_extractingValue_Test.java
index e0813b66b7..369b90e163 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/OptionalAssert_extractingValue_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/OptionalAssert_extractingValue_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/OptionalAssert_isAbsent_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/OptionalAssert_isAbsent_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/OptionalAssert_isAbsent_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/OptionalAssert_isAbsent_Test.java
index 1adc396450..6934a61aa0 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/OptionalAssert_isAbsent_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/OptionalAssert_isAbsent_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/OptionalAssert_isPresent_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/OptionalAssert_isPresent_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/OptionalAssert_isPresent_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/OptionalAssert_isPresent_Test.java
index 1dac502ebe..cac19467f1 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/OptionalAssert_isPresent_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/OptionalAssert_isPresent_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_contains_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_contains_Test.java
similarity index 96%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_contains_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_contains_Test.java
index 6b9088d2ed..6acd4ff7c1 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_contains_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_contains_Test.java
@@ -10,14 +10,14 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.catchThrowable;
import static org.assertj.core.api.BDDAssertions.then;
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.guava.api.Assertions.assertThat;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import static org.assertj.guava.tests.testkit.AssertionErrors.expectAssertionError;
import org.junit.jupiter.api.Test;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_doesNotContain_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_doesNotContain_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_doesNotContain_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_doesNotContain_Test.java
index 1e4938410f..da66733043 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_doesNotContain_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_doesNotContain_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_hasClosedLowerBound_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_hasClosedLowerBound_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_hasClosedLowerBound_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_hasClosedLowerBound_Test.java
index 007add5bfd..52b7261987 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_hasClosedLowerBound_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_hasClosedLowerBound_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_hasClosedUpperBound_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_hasClosedUpperBound_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_hasClosedUpperBound_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_hasClosedUpperBound_Test.java
index 06ee85a2a8..636d0afe2e 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_hasClosedUpperBound_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_hasClosedUpperBound_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_hasLowerEndpointEqualTo_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_hasLowerEndpointEqualTo_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_hasLowerEndpointEqualTo_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_hasLowerEndpointEqualTo_Test.java
index c40c52422f..0b6834adc8 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_hasLowerEndpointEqualTo_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_hasLowerEndpointEqualTo_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_hasOpenedLowerBound_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_hasOpenedLowerBound_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_hasOpenedLowerBound_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_hasOpenedLowerBound_Test.java
index 77b93c5cf4..c0616d075c 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_hasOpenedLowerBound_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_hasOpenedLowerBound_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_hasOpenedUpperBound_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_hasOpenedUpperBound_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_hasOpenedUpperBound_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_hasOpenedUpperBound_Test.java
index f1d19fa481..5e5c7bd419 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_hasOpenedUpperBound_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_hasOpenedUpperBound_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_hasUpperEndpointEqualTo_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_hasUpperEndpointEqualTo_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_hasUpperEndpointEqualTo_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_hasUpperEndpointEqualTo_Test.java
index 06ce3cd705..4e03166701 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_hasUpperEndpointEqualTo_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_hasUpperEndpointEqualTo_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_isEmpty_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_isEmpty_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_isEmpty_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_isEmpty_Test.java
index 674d05a7c2..bcf7065bab 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_isEmpty_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_isEmpty_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_isNotEmpty_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_isNotEmpty_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_isNotEmpty_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_isNotEmpty_Test.java
index cb1f80a9d7..bd4b46d2d0 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeAssert_isNotEmpty_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeAssert_isNotEmpty_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeMapAssertBaseTest.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeMapAssertBaseTest.java
similarity index 97%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeMapAssertBaseTest.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeMapAssertBaseTest.java
index c9dd0a4382..57b1b21982 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeMapAssertBaseTest.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeMapAssertBaseTest.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import org.junit.jupiter.api.BeforeEach;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeMapAssert_containsKeys_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeMapAssert_containsKeys_Test.java
similarity index 99%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeMapAssert_containsKeys_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeMapAssert_containsKeys_Test.java
index 83bfe97a60..a2954e0c1c 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeMapAssert_containsKeys_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeMapAssert_containsKeys_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeMapAssert_containsValues_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeMapAssert_containsValues_Test.java
similarity index 99%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeMapAssert_containsValues_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeMapAssert_containsValues_Test.java
index 2d0df3ea3c..c25ed51410 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeMapAssert_containsValues_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeMapAssert_containsValues_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeMapAssert_contains_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeMapAssert_contains_Test.java
similarity index 95%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeMapAssert_contains_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeMapAssert_contains_Test.java
index 5f0e17f424..2bf5704009 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeMapAssert_contains_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeMapAssert_contains_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.util.Arrays.asList;
import static org.assertj.core.api.Assertions.catchThrowable;
@@ -20,7 +20,7 @@
import static org.assertj.core.util.Arrays.array;
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.guava.api.Assertions.assertThat;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import static org.assertj.guava.tests.testkit.AssertionErrors.expectAssertionError;
import org.assertj.core.data.MapEntry;
import org.junit.jupiter.api.Test;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeMapAssert_isEmpty_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeMapAssert_isEmpty_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeMapAssert_isEmpty_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeMapAssert_isEmpty_Test.java
index 668639cd13..021d3ef0b5 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeMapAssert_isEmpty_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeMapAssert_isEmpty_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeMapAssert_isNotEmpty_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeMapAssert_isNotEmpty_Test.java
similarity index 97%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeMapAssert_isNotEmpty_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeMapAssert_isNotEmpty_Test.java
index a4301fce14..7862be6125 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeMapAssert_isNotEmpty_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeMapAssert_isNotEmpty_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
@@ -49,4 +49,4 @@ public void should_fail_if_actual_is_empty() {
.hasMessage(format("%nExpecting actual not to be empty"));
}
-}
\ No newline at end of file
+}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_containsAll_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_containsAll_Test.java
similarity index 91%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_containsAll_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_containsAll_Test.java
index 01cf2705f3..ce7978a262 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_containsAll_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_containsAll_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static java.util.Arrays.asList;
@@ -21,8 +21,8 @@
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.core.util.IterableUtil.iterable;
import static org.assertj.guava.api.Assertions.assertThat;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -39,7 +39,7 @@ void should_fail_if_actual_is_null() {
RangeSet actual = null;
Iterable values = iterable(1);
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).containsAll(values));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).containsAll(values));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -74,7 +74,7 @@ void should_fail_if_actual_does_not_contain_values() {
RangeSet actual = ImmutableRangeSet.of(closed(0, 3));
Iterable expected = iterable(3, 4, 5);
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).containsAll(asList(3, 4, 5)));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).containsAll(asList(3, 4, 5)));
// THEN
then(error).hasMessage(shouldContain(actual, expected, asList(4, 5)).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_containsAnyOf_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_containsAnyOf_Test.java
similarity index 90%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_containsAnyOf_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_containsAnyOf_Test.java
index 0bfc47866b..f270f9515a 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_containsAnyOf_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_containsAnyOf_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static org.assertj.core.api.Assertions.catchThrowable;
@@ -20,8 +20,8 @@
import static org.assertj.core.util.Arrays.array;
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.guava.api.Assertions.assertThat;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -37,7 +37,7 @@ void should_fail_if_actual_is_null() {
// GIVEN
RangeSet actual = null;
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).containsAnyOf(1));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).containsAnyOf(1));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -72,7 +72,7 @@ void should_fail_if_actual_does_not_contain_values() {
RangeSet actual = ImmutableRangeSet.of(closed(0, 3));
Integer[] values = array(4, 5);
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).containsAnyOf(values));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).containsAnyOf(values));
// THEN
then(error).hasMessage(shouldContainAnyOf(actual, values).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_containsAnyRangesOf_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_containsAnyRangesOf_Test.java
similarity index 90%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_containsAnyRangesOf_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_containsAnyRangesOf_Test.java
index 08065b0f1e..e7030e1853 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_containsAnyRangesOf_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_containsAnyRangesOf_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static java.util.Arrays.asList;
@@ -22,10 +22,10 @@
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.core.util.Lists.list;
import static org.assertj.guava.api.Assertions.assertThat;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
import java.util.List;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -41,7 +41,7 @@ void should_fail_if_actual_is_null() {
// GIVEN
RangeSet actual = null;
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).containsAnyRangesOf(asList(1, 2)));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).containsAnyRangesOf(asList(1, 2)));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -76,7 +76,7 @@ void should_fail_if_actual_does_not_contain_values() {
RangeSet actual = ImmutableRangeSet.of(closed(0, 3));
List values = list(4, 5);
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).containsAnyRangesOf(values));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).containsAnyRangesOf(values));
// THEN
then(error).hasMessage(shouldContainAnyOf(actual, values).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_contains_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_contains_Test.java
similarity index 91%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_contains_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_contains_Test.java
index fe4f10786a..44e476f638 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_contains_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_contains_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static org.assertj.core.api.Assertions.catchThrowable;
@@ -20,8 +20,8 @@
import static org.assertj.core.util.Arrays.array;
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.guava.api.Assertions.assertThat;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -37,7 +37,7 @@ void should_fail_if_actual_is_null() {
// GIVEN
RangeSet actual = null;
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).contains(1));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).contains(1));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -72,7 +72,7 @@ void should_fail_if_actual_does_not_contain_values() {
RangeSet actual = ImmutableRangeSet.of(closed(0, 3));
Integer[] values = array(3, 4, 5);
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).contains(values));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).contains(values));
// THEN
then(error).hasMessage(shouldContain(actual, values, array(4, 5)).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_doesNotContainAll_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_doesNotContainAll_Test.java
similarity index 89%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_doesNotContainAll_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_doesNotContainAll_Test.java
index d3cd14cd01..83370f1b14 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_doesNotContainAll_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_doesNotContainAll_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static java.util.Arrays.asList;
@@ -23,8 +23,8 @@
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.core.util.Lists.list;
import static org.assertj.guava.api.Assertions.assertThat;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -40,7 +40,7 @@ void should_fail_if_actual_is_null() {
// GIVEN
RangeSet actual = null;
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).doesNotContainAll(asList(1, 2)));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).doesNotContainAll(asList(1, 2)));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -75,7 +75,7 @@ void should_fail_if_actual_contains_values() {
RangeSet actual = ImmutableRangeSet.of(closed(1, 10));
Iterable values = list(0, 2, 3, 4);
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).doesNotContainAll(values));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).doesNotContainAll(values));
// THEN
then(error).hasMessage(shouldNotContain(actual, values, list(2, 3, 4)).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_doesNotContain_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_doesNotContain_Test.java
similarity index 89%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_doesNotContain_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_doesNotContain_Test.java
index bddbdabb9c..402312cf2e 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_doesNotContain_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_doesNotContain_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static org.assertj.core.api.Assertions.catchThrowable;
@@ -20,8 +20,8 @@
import static org.assertj.core.util.Arrays.array;
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.guava.api.Assertions.assertThat;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -37,7 +37,7 @@ void should_fail_if_actual_is_null() {
// GIVEN
RangeSet actual = null;
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).doesNotContain(1));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).doesNotContain(1));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -72,7 +72,7 @@ void should_fail_if_actual_contains_values() {
RangeSet actual = ImmutableRangeSet.of(closed(1, 10));
Integer[] values = array(0, 2, 3, 4);
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).doesNotContain(values));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).doesNotContain(values));
// THEN
then(error).hasMessage(shouldNotContain(actual, values, array(2, 3, 4)).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_doesNotEncloseAnyRangesOf_with_Iterable_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_doesNotEncloseAnyRangesOf_with_Iterable_Test.java
similarity index 90%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_doesNotEncloseAnyRangesOf_with_Iterable_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_doesNotEncloseAnyRangesOf_with_Iterable_Test.java
index 8c297cef79..c5858a25ef 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_doesNotEncloseAnyRangesOf_with_Iterable_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_doesNotEncloseAnyRangesOf_with_Iterable_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static com.google.common.collect.Range.open;
@@ -23,8 +23,8 @@
import static org.assertj.core.util.Lists.list;
import static org.assertj.guava.api.Assertions.assertThat;
import static org.assertj.guava.error.RangeSetShouldNotEnclose.shouldNotEnclose;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -39,7 +39,7 @@ void should_fail_if_actual_is_null() {
RangeSet actual = null;
Iterable> ranges = list(closed(0, 10));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).doesNotEncloseAnyRangesOf(ranges));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).doesNotEncloseAnyRangesOf(ranges));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -74,7 +74,7 @@ void should_fail_if_actual_encloses_ranges() {
RangeSet actual = ImmutableRangeSet.of(closed(0, 100));
Iterable> ranges = list(open(10, 50), open(50, 110));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).doesNotEncloseAnyRangesOf(ranges));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).doesNotEncloseAnyRangesOf(ranges));
// THEN
then(error).hasMessage(shouldNotEnclose(actual, ranges, singleton(open(10, 50))).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_doesNotEncloseAnyRangesOf_with_RangeSet_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_doesNotEncloseAnyRangesOf_with_RangeSet_Test.java
similarity index 90%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_doesNotEncloseAnyRangesOf_with_RangeSet_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_doesNotEncloseAnyRangesOf_with_RangeSet_Test.java
index ec2153ede0..d570f97026 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_doesNotEncloseAnyRangesOf_with_RangeSet_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_doesNotEncloseAnyRangesOf_with_RangeSet_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static com.google.common.collect.Range.open;
@@ -21,8 +21,8 @@
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.guava.api.Assertions.assertThat;
import static org.assertj.guava.error.RangeSetShouldNotEnclose.shouldNotEnclose;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -36,7 +36,7 @@ void should_fail_if_actual_is_null() {
RangeSet actual = null;
RangeSet rangeSet = ImmutableRangeSet.of(closed(0, 1));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).doesNotEncloseAnyRangesOf(rangeSet));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).doesNotEncloseAnyRangesOf(rangeSet));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -74,7 +74,7 @@ void should_fail_if_actual_encloses_rangeSet() {
.add(open(50, 110))
.build();
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).doesNotEncloseAnyRangesOf(rangeSet));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).doesNotEncloseAnyRangesOf(rangeSet));
// THEN
then(error).hasMessage(shouldNotEnclose(actual, rangeSet, singleton(open(10, 50))).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_doesNotEnclose_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_doesNotEnclose_Test.java
similarity index 90%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_doesNotEnclose_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_doesNotEnclose_Test.java
index d9454ac2c3..5c4f87254a 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_doesNotEnclose_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_doesNotEnclose_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static com.google.common.collect.Range.open;
@@ -22,8 +22,8 @@
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.guava.api.Assertions.assertThat;
import static org.assertj.guava.error.RangeSetShouldNotEnclose.shouldNotEnclose;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -37,7 +37,7 @@ void should_fail_if_actual_is_null() {
// GIVEN
RangeSet actual = null;
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).doesNotEnclose(closed(0, 1)));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).doesNotEnclose(closed(0, 1)));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -72,7 +72,7 @@ void should_fail_if_actual_encloses_ranges() {
RangeSet actual = ImmutableRangeSet.of(closed(0, 100));
Range[] ranges = array(open(10, 50), open(50, 110));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).doesNotEnclose(ranges));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).doesNotEnclose(ranges));
// THEN
then(error).hasMessage(shouldNotEnclose(actual, ranges, singleton(open(10, 50))).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_doesNotIntersectAnyRangeFrom_with_Iterable_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_doesNotIntersectAnyRangeFrom_with_Iterable_Test.java
similarity index 90%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_doesNotIntersectAnyRangeFrom_with_Iterable_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_doesNotIntersectAnyRangeFrom_with_Iterable_Test.java
index 4e3357e982..58b8b7fb02 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_doesNotIntersectAnyRangeFrom_with_Iterable_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_doesNotIntersectAnyRangeFrom_with_Iterable_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static com.google.common.collect.Range.open;
@@ -23,8 +23,8 @@
import static org.assertj.core.util.Lists.list;
import static org.assertj.guava.api.Assertions.assertThat;
import static org.assertj.guava.error.RangeSetShouldNotIntersect.shouldNotIntersect;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -39,7 +39,7 @@ void should_fail_if_actual_is_null() {
RangeSet actual = null;
Iterable> ranges = list(closed(0, 10));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).doesNotIntersectAnyRangeFrom(ranges));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).doesNotIntersectAnyRangeFrom(ranges));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -74,7 +74,7 @@ void should_fail_if_actual_intersects_ranges() {
RangeSet actual = ImmutableRangeSet.of(closed(0, 100));
Iterable> ranges = list(open(-100, 0), open(90, 170));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).doesNotIntersectAnyRangeFrom(ranges));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).doesNotIntersectAnyRangeFrom(ranges));
// THEN
then(error).hasMessage(shouldNotIntersect(actual, ranges, singletonList(open(90, 170))).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_doesNotIntersectAnyRangeFrom_with_RangeSet_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_doesNotIntersectAnyRangeFrom_with_RangeSet_Test.java
similarity index 90%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_doesNotIntersectAnyRangeFrom_with_RangeSet_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_doesNotIntersectAnyRangeFrom_with_RangeSet_Test.java
index 82e3694988..c92e0714b0 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_doesNotIntersectAnyRangeFrom_with_RangeSet_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_doesNotIntersectAnyRangeFrom_with_RangeSet_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static com.google.common.collect.Range.open;
@@ -21,8 +21,8 @@
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.guava.api.Assertions.assertThat;
import static org.assertj.guava.error.RangeSetShouldNotIntersect.shouldNotIntersect;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -36,7 +36,7 @@ void should_fail_if_actual_is_null() {
RangeSet actual = null;
RangeSet rangeSet = ImmutableRangeSet.of(closed(0, 1));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).doesNotIntersectAnyRangeFrom(rangeSet));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).doesNotIntersectAnyRangeFrom(rangeSet));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -74,7 +74,7 @@ void should_fail_if_actual_intersects_rangeSet() {
.add(open(90, 170))
.build();
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).doesNotIntersectAnyRangeFrom(rangeSet));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).doesNotIntersectAnyRangeFrom(rangeSet));
// THEN
then(error).hasMessage(shouldNotIntersect(actual, rangeSet, singleton(open(90, 170))).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_doesNotIntersect_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_doesNotIntersect_Test.java
similarity index 90%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_doesNotIntersect_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_doesNotIntersect_Test.java
index 71b965733f..ea1199fd29 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_doesNotIntersect_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_doesNotIntersect_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static com.google.common.collect.Range.open;
@@ -22,8 +22,8 @@
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.guava.api.Assertions.assertThat;
import static org.assertj.guava.error.RangeSetShouldNotIntersect.shouldNotIntersect;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -37,7 +37,7 @@ void should_fail_if_actual_is_null() {
// GIVEN
RangeSet actual = null;
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).doesNotIntersect(closed(0, 1)));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).doesNotIntersect(closed(0, 1)));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -72,7 +72,7 @@ void should_fail_if_actual_intersects_ranges() {
RangeSet actual = ImmutableRangeSet.of(closed(0, 100));
Range[] ranges = array(open(-100, 0), open(90, 170));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).doesNotIntersect(ranges));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).doesNotIntersect(ranges));
// THEN
then(error).hasMessage(shouldNotIntersect(actual, ranges, asList(open(90, 170))).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_enclosesAll_with_Iterable_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_enclosesAll_with_Iterable_Test.java
similarity index 91%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_enclosesAll_with_Iterable_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_enclosesAll_with_Iterable_Test.java
index 8784aa1ea2..d53d473e16 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_enclosesAll_with_Iterable_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_enclosesAll_with_Iterable_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static com.google.common.collect.Range.open;
@@ -22,10 +22,10 @@
import static org.assertj.core.util.Lists.list;
import static org.assertj.guava.api.Assertions.assertThat;
import static org.assertj.guava.error.RangeSetShouldEnclose.shouldEnclose;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
import java.util.List;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -40,7 +40,7 @@ void should_fail_if_actual_is_null() {
RangeSet actual = null;
Iterable> ranges = list(closed(0, 10));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).enclosesAll(ranges));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).enclosesAll(ranges));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -75,7 +75,7 @@ void should_fail_if_actual_does_not_enclose_ranges() {
RangeSet actual = ImmutableRangeSet.of(closed(0, 100));
Iterable> ranges = list(closed(50, 70), closed(120, 150));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).enclosesAll(ranges));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).enclosesAll(ranges));
// THEN
then(error).hasMessage(shouldEnclose(actual, ranges, list(closed(120, 150))).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_enclosesAll_with_RangeSet_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_enclosesAll_with_RangeSet_Test.java
similarity index 92%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_enclosesAll_with_RangeSet_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_enclosesAll_with_RangeSet_Test.java
index fe6b5046b5..f18d55546a 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_enclosesAll_with_RangeSet_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_enclosesAll_with_RangeSet_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static com.google.common.collect.Range.open;
@@ -21,8 +21,8 @@
import static org.assertj.core.util.Lists.list;
import static org.assertj.guava.api.Assertions.assertThat;
import static org.assertj.guava.error.RangeSetShouldEnclose.shouldEnclose;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -36,7 +36,7 @@ void should_fail_if_actual_is_null() {
RangeSet actual = null;
RangeSet rangeSet = ImmutableRangeSet.of(closed(0, 1));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).enclosesAll(rangeSet));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).enclosesAll(rangeSet));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -74,7 +74,7 @@ void should_fail_if_actual_does_not_enclose_rangeSet() {
.add(closed(120, 150))
.build();
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).enclosesAll(expected));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).enclosesAll(expected));
// THEN
then(error).hasMessage(shouldEnclose(actual, expected, list(closed(120, 150))).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_enclosesAnyOf_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_enclosesAnyOf_Test.java
similarity index 91%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_enclosesAnyOf_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_enclosesAnyOf_Test.java
index 660c4c10ce..80e924566e 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_enclosesAnyOf_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_enclosesAnyOf_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static com.google.common.collect.Range.open;
@@ -21,8 +21,8 @@
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.guava.api.Assertions.assertThat;
import static org.assertj.guava.error.RangeSetShouldEncloseAnyOf.shouldEncloseAnyOf;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -36,7 +36,7 @@ void should_fail_if_actual_is_null() {
// GIVEN
RangeSet actual = null;
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).enclosesAnyOf(closed(0, 1)));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).enclosesAnyOf(closed(0, 1)));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -72,7 +72,7 @@ void should_fail_if_the_given_set_does_not_enclose_ranges() {
Range[] ranges = array(closed(0, 70),
closed(120, 150));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).enclosesAnyOf(ranges));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).enclosesAnyOf(ranges));
// THEN
then(error).hasMessage(shouldEncloseAnyOf(actual, ranges).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_enclosesAnyRangesOf_with_Iterable_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_enclosesAnyRangesOf_with_Iterable_Test.java
similarity index 91%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_enclosesAnyRangesOf_with_Iterable_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_enclosesAnyRangesOf_with_Iterable_Test.java
index 96ca5cd392..8be545f7d4 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_enclosesAnyRangesOf_with_Iterable_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_enclosesAnyRangesOf_with_Iterable_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static com.google.common.collect.Range.open;
@@ -23,8 +23,8 @@
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.guava.api.Assertions.assertThat;
import static org.assertj.guava.error.RangeSetShouldEncloseAnyOf.shouldEncloseAnyOf;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -39,7 +39,7 @@ void should_fail_if_actual_is_null() {
RangeSet actual = null;
Iterable> ranges = emptySet();
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).enclosesAnyRangesOf(ranges));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).enclosesAnyRangesOf(ranges));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -74,7 +74,7 @@ void should_fail_if_actual_does_not_enclose_ranges() {
RangeSet actual = ImmutableRangeSet.of(open(0, 100));
Iterable> ranges = asList(closed(0, 10), open(90, 110));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).enclosesAnyRangesOf(ranges));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).enclosesAnyRangesOf(ranges));
// THEN
then(error).hasMessage(shouldEncloseAnyOf(actual, ranges).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_enclosesAnyRangesOf_with_RangeSet_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_enclosesAnyRangesOf_with_RangeSet_Test.java
similarity index 91%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_enclosesAnyRangesOf_with_RangeSet_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_enclosesAnyRangesOf_with_RangeSet_Test.java
index 4a9f4572ff..9831cfab69 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_enclosesAnyRangesOf_with_RangeSet_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_enclosesAnyRangesOf_with_RangeSet_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static com.google.common.collect.Range.open;
@@ -20,8 +20,8 @@
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.guava.api.Assertions.assertThat;
import static org.assertj.guava.error.RangeSetShouldEncloseAnyOf.shouldEncloseAnyOf;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -35,7 +35,7 @@ void should_fail_if_actual_is_null() {
RangeSet actual = null;
RangeSet rangeSet = ImmutableRangeSet.of(closed(0, 1));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).enclosesAnyRangesOf(rangeSet));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).enclosesAnyRangesOf(rangeSet));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -73,7 +73,7 @@ void should_fail_if_actual_does_not_enclose_rangeSet() {
.add(open(90, 110))
.build();
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).enclosesAnyRangesOf(rangeSet));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).enclosesAnyRangesOf(rangeSet));
// THEN
then(error).hasMessage(shouldEncloseAnyOf(actual, rangeSet).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_encloses_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_encloses_Test.java
similarity index 91%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_encloses_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_encloses_Test.java
index a688d5663b..d65abd400f 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_encloses_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_encloses_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static com.google.common.collect.Range.open;
@@ -22,8 +22,8 @@
import static org.assertj.core.util.IterableUtil.iterable;
import static org.assertj.guava.api.Assertions.assertThat;
import static org.assertj.guava.error.RangeSetShouldEnclose.shouldEnclose;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -37,7 +37,7 @@ void should_fail_if_actual_is_null() {
// GIVEN
RangeSet actual = null;
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).encloses(closed(0, 1)));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).encloses(closed(0, 1)));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -72,7 +72,7 @@ void should_fail_if_actual_does_not_enclose_ranges() {
RangeSet actual = ImmutableRangeSet.of(closed(0, 100));
Range[] ranges = array(closed(50, 70), closed(120, 150));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).encloses(ranges));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).encloses(ranges));
// THEN
then(error).hasMessage(shouldEnclose(actual, ranges, iterable(closed(120, 150))).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_hasSize_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_hasSize_Test.java
similarity index 88%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_hasSize_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_hasSize_Test.java
index 0a59e0d6bf..256df2126d 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_hasSize_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_hasSize_Test.java
@@ -10,15 +10,15 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static org.assertj.core.api.BDDAssertions.then;
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.guava.api.Assertions.assertThat;
import static org.assertj.guava.error.ShouldHaveSize.shouldHaveSize;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -31,7 +31,7 @@ void should_fail_if_actual_is_null() {
// GIVEN
RangeSet actual = null;
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).hasSize(5));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).hasSize(5));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -45,7 +45,7 @@ void should_fail_if_actual_size_does_not_match_expected() {
.add(closed(40, 45))
.build();
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).hasSize(5));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).hasSize(5));
// THEN
then(error).isInstanceOf(AssertionError.class)
.hasMessage(shouldHaveSize(actual, actual.asRanges().size(), 5).create());
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_intersectsAll_with_Iterable_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_intersectsAll_with_Iterable_Test.java
similarity index 91%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_intersectsAll_with_Iterable_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_intersectsAll_with_Iterable_Test.java
index 1c440faf8f..c2d6e3a6ba 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_intersectsAll_with_Iterable_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_intersectsAll_with_Iterable_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static com.google.common.collect.Range.open;
@@ -22,8 +22,8 @@
import static org.assertj.core.util.Lists.list;
import static org.assertj.guava.api.Assertions.assertThat;
import static org.assertj.guava.error.RangeSetShouldIntersect.shouldIntersect;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -41,7 +41,7 @@ void should_fail_if_actual_is_null() {
RangeSet actual = null;
Iterable> ranges = list(closed(0, 10));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).intersectsAll(ranges));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).intersectsAll(ranges));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -76,7 +76,7 @@ void should_fail_if_actual_does_not_intersect_ranges() {
RangeSet actual = ImmutableRangeSet.of(closed(0, 100));
Iterable> ranges = list(closed(50, 70), closed(120, 150));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).intersectsAll(ranges));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).intersectsAll(ranges));
// THEN
then(error).hasMessage(shouldIntersect(actual, ranges, list(closed(120, 150))).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_intersectsAll_with_RangeSet_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_intersectsAll_with_RangeSet_Test.java
similarity index 92%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_intersectsAll_with_RangeSet_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_intersectsAll_with_RangeSet_Test.java
index ee5e051690..c788165423 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_intersectsAll_with_RangeSet_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_intersectsAll_with_RangeSet_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static com.google.common.collect.Range.open;
@@ -21,8 +21,8 @@
import static org.assertj.core.util.Lists.list;
import static org.assertj.guava.api.Assertions.assertThat;
import static org.assertj.guava.error.RangeSetShouldIntersect.shouldIntersect;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -39,7 +39,7 @@ void should_fail_if_actual_is_null() {
RangeSet actual = null;
RangeSet rangeSet = ImmutableRangeSet.of(closed(0, 1));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).intersectsAll(rangeSet));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).intersectsAll(rangeSet));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -77,7 +77,7 @@ void should_fail_if_actual_does_not_intersect_rangeSet() {
.add(closed(120, 150))
.build();
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).intersectsAll(expected));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).intersectsAll(expected));
// THEN
then(error).hasMessage(shouldIntersect(actual, expected, list(closed(120, 150))).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_intersectsAnyOf_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_intersectsAnyOf_Test.java
similarity index 90%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_intersectsAnyOf_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_intersectsAnyOf_Test.java
index 211c4792d4..e6bd1291a4 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_intersectsAnyOf_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_intersectsAnyOf_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static com.google.common.collect.Range.open;
@@ -21,8 +21,8 @@
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.guava.api.Assertions.assertThat;
import static org.assertj.guava.error.RangeSetShouldIntersectAnyOf.shouldIntersectAnyOf;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -36,7 +36,7 @@ void should_fail_if_actual_is_null() {
// GIVEN
RangeSet actual = null;
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).intersectsAnyOf(closed(0, 1)));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).intersectsAnyOf(closed(0, 1)));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -72,7 +72,7 @@ void should_fail_if_the_given_set_does_not_intersect_ranges() {
Range[] ranges = array(closed(-100, 0),
closed(100, 200));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).intersectsAnyOf(ranges));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).intersectsAnyOf(ranges));
// THEN
then(error).hasMessage(shouldIntersectAnyOf(actual, ranges).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_intersectsAnyRangesOf_with_Iterable_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_intersectsAnyRangesOf_with_Iterable_Test.java
similarity index 91%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_intersectsAnyRangesOf_with_Iterable_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_intersectsAnyRangesOf_with_Iterable_Test.java
index 99acdfc980..4e7521cb19 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_intersectsAnyRangesOf_with_Iterable_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_intersectsAnyRangesOf_with_Iterable_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static com.google.common.collect.Range.open;
@@ -23,8 +23,8 @@
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.guava.api.Assertions.assertThat;
import static org.assertj.guava.error.RangeSetShouldIntersectAnyOf.shouldIntersectAnyOf;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -42,7 +42,7 @@ void should_fail_if_actual_is_null() {
RangeSet actual = null;
Iterable> ranges = emptySet();
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).intersectsAnyRangesOf(ranges));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).intersectsAnyRangesOf(ranges));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -78,7 +78,7 @@ void should_fail_if_actual_does_not_intersect_ranges() {
Iterable> ranges = asList(closed(-100, 0),
closed(100, 200));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).intersectsAnyRangesOf(ranges));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).intersectsAnyRangesOf(ranges));
// THEN
then(error).hasMessage(shouldIntersectAnyOf(actual, ranges).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_intersectsAnyRangesOf_with_RangeSet_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_intersectsAnyRangesOf_with_RangeSet_Test.java
similarity index 91%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_intersectsAnyRangesOf_with_RangeSet_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_intersectsAnyRangesOf_with_RangeSet_Test.java
index b73af332b5..0b6bec0425 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_intersectsAnyRangesOf_with_RangeSet_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_intersectsAnyRangesOf_with_RangeSet_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static com.google.common.collect.Range.open;
@@ -20,8 +20,8 @@
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.guava.api.Assertions.assertThat;
import static org.assertj.guava.error.RangeSetShouldIntersectAnyOf.shouldIntersectAnyOf;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -38,7 +38,7 @@ void should_fail_if_actual_is_null() {
RangeSet actual = null;
RangeSet rangeSet = ImmutableRangeSet.of(closed(0, 1));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).intersectsAnyRangesOf(rangeSet));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).intersectsAnyRangesOf(rangeSet));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -76,7 +76,7 @@ void should_fail_if_actual_does_not_intersect_rangeSet() {
.add(closed(100, 200))
.build();
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).intersectsAnyRangesOf(rangeSet));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).intersectsAnyRangesOf(rangeSet));
// THEN
then(error).hasMessage(shouldIntersectAnyOf(actual, rangeSet).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_intersects_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_intersects_Test.java
similarity index 91%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_intersects_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_intersects_Test.java
index 613cab656d..a7a851f933 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_intersects_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_intersects_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static com.google.common.collect.Range.open;
@@ -22,8 +22,8 @@
import static org.assertj.core.util.IterableUtil.iterable;
import static org.assertj.guava.api.Assertions.assertThat;
import static org.assertj.guava.error.RangeSetShouldIntersect.shouldIntersect;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -40,7 +40,7 @@ void should_fail_if_actual_is_null() {
// GIVEN
RangeSet actual = null;
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).intersects(closed(0, 1)));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).intersects(closed(0, 1)));
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -75,7 +75,7 @@ void should_fail_if_actual_does_not_intersect_ranges() {
RangeSet actual = ImmutableRangeSet.of(closed(0, 100));
Range[] ranges = array(closed(50, 70), closed(120, 150));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).intersects(ranges));
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).intersects(ranges));
// THEN
then(error).hasMessage(shouldIntersect(actual, ranges, iterable(closed(120, 150))).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_isEmpty_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_isEmpty_Test.java
similarity index 85%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_isEmpty_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_isEmpty_Test.java
index ce4732223e..59271ac4a0 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_isEmpty_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_isEmpty_Test.java
@@ -10,14 +10,14 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static org.assertj.core.api.BDDAssertions.then;
import static org.assertj.core.error.ShouldBeEmpty.shouldBeEmpty;
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.guava.api.Assertions.assertThat;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -34,7 +34,7 @@ void should_fail_if_actual_is_null() {
// GIVEN
RangeSet actual = null;
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).isEmpty());
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).isEmpty());
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -44,7 +44,7 @@ void should_fail_if_actual_is_not_empty() {
// GIVEN
RangeSet actual = ImmutableRangeSet.of(Range.closed(1, 10));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).isEmpty());
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).isEmpty());
// THEN
then(error).hasMessage(shouldBeEmpty(actual).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_isNotEmpty_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_isNotEmpty_Test.java
similarity index 84%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_isNotEmpty_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_isNotEmpty_Test.java
index e1814fcdfd..9037a2a7af 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_isNotEmpty_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_isNotEmpty_Test.java
@@ -10,14 +10,14 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static org.assertj.core.api.BDDAssertions.then;
import static org.assertj.core.error.ShouldNotBeEmpty.shouldNotBeEmpty;
import static org.assertj.core.util.FailureMessages.actualIsNull;
import static org.assertj.guava.api.Assertions.assertThat;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -34,7 +34,7 @@ void should_fail_if_actual_is_null() {
// GIVEN
RangeSet actual = null;
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).isNotEmpty());
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).isNotEmpty());
// THEN
then(error).hasMessage(actualIsNull());
}
@@ -44,7 +44,7 @@ void should_fail_if_actual_is_empty() {
// GIVEN
RangeSet actual = ImmutableRangeSet.of();
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).isNotEmpty());
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).isNotEmpty());
// THEN
then(error).hasMessage(shouldNotBeEmpty().create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_isNullOrEmpty_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_isNullOrEmpty_Test.java
similarity index 89%
rename from assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_isNullOrEmpty_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_isNullOrEmpty_Test.java
index 8702d96253..2ec3f6bfcf 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/RangeSetAssert_isNullOrEmpty_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/RangeSetAssert_isNullOrEmpty_Test.java
@@ -10,14 +10,14 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static com.google.common.collect.Range.closed;
import static org.assertj.core.api.BDDAssertions.then;
import static org.assertj.core.error.ShouldBeNullOrEmpty.shouldBeNullOrEmpty;
import static org.assertj.guava.api.Assertions.assertThat;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import org.assertj.guava.tests.testkit.AssertionErrors;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableRangeSet;
@@ -49,7 +49,7 @@ void should_fail_if_actual_is_not_null_and_not_empty() {
// GIVEN
RangeSet actual = ImmutableRangeSet.of(closed(1, 10));
// WHEN
- AssertionError error = expectAssertionError(() -> assertThat(actual).isNullOrEmpty());
+ AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).isNullOrEmpty());
// WHEN/THEN
then(error).hasMessage(shouldBeNullOrEmpty(actual).create());
}
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/TableAssertBaseTest.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssertBaseTest.java
similarity index 96%
rename from assertj-guava/src/test/java/org/assertj/guava/api/TableAssertBaseTest.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssertBaseTest.java
index ea221606f2..efbcba3e8b 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/TableAssertBaseTest.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssertBaseTest.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import org.junit.jupiter.api.BeforeEach;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/TableAssert_containsCells_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssert_containsCells_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/TableAssert_containsCells_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssert_containsCells_Test.java
index abb9075570..c9c80ba2ff 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/TableAssert_containsCells_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssert_containsCells_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/TableAssert_containsColumns_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssert_containsColumns_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/TableAssert_containsColumns_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssert_containsColumns_Test.java
index 4d379bb99a..90df0069f5 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/TableAssert_containsColumns_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssert_containsColumns_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/TableAssert_containsRows_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssert_containsRows_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/TableAssert_containsRows_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssert_containsRows_Test.java
index 1674c4701d..7a9be2ce4b 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/TableAssert_containsRows_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssert_containsRows_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/TableAssert_containsValues_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssert_containsValues_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/TableAssert_containsValues_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssert_containsValues_Test.java
index 99779c3d56..9825e3215e 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/TableAssert_containsValues_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssert_containsValues_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/TableAssert_hasColumnCount_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssert_hasColumnCount_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/TableAssert_hasColumnCount_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssert_hasColumnCount_Test.java
index 294fb261a3..a0a670bf54 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/TableAssert_hasColumnCount_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssert_hasColumnCount_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/TableAssert_hasRowCount_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssert_hasRowCount_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/TableAssert_hasRowCount_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssert_hasRowCount_Test.java
index 252d073989..64838650db 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/TableAssert_hasRowCount_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssert_hasRowCount_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/TableAssert_hasSize_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssert_hasSize_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/TableAssert_hasSize_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssert_hasSize_Test.java
index 25da0da790..4755f96085 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/TableAssert_hasSize_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssert_hasSize_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/api/TableAssert_isEmpty_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssert_isEmpty_Test.java
similarity index 98%
rename from assertj-guava/src/test/java/org/assertj/guava/api/TableAssert_isEmpty_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssert_isEmpty_Test.java
index d58f71677f..21a9620a55 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/api/TableAssert_isEmpty_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/api/TableAssert_isEmpty_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/error/RangeSetShouldEncloseAnyOf_create_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/error/RangeSetShouldEncloseAnyOf_create_Test.java
similarity index 95%
rename from assertj-guava/src/test/java/org/assertj/guava/error/RangeSetShouldEncloseAnyOf_create_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/error/RangeSetShouldEncloseAnyOf_create_Test.java
index fe1cc2d371..ee9e2d0d68 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/error/RangeSetShouldEncloseAnyOf_create_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/error/RangeSetShouldEncloseAnyOf_create_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.error;
+package org.assertj.guava.tests.error;
import static com.google.common.collect.ImmutableRangeSet.of;
import static com.google.common.collect.Range.closed;
@@ -23,6 +23,7 @@
import org.assertj.core.description.TextDescription;
import org.assertj.core.error.ErrorMessageFactory;
import org.assertj.core.presentation.StandardRepresentation;
+import org.assertj.guava.error.RangeSetShouldEncloseAnyOf;
import org.junit.jupiter.api.Test;
/**
diff --git a/assertj-guava/src/test/java/org/assertj/guava/error/RangeSetShouldEnclose_create_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/error/RangeSetShouldEnclose_create_Test.java
similarity index 96%
rename from assertj-guava/src/test/java/org/assertj/guava/error/RangeSetShouldEnclose_create_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/error/RangeSetShouldEnclose_create_Test.java
index 9cd26c6b8b..bee9ae7938 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/error/RangeSetShouldEnclose_create_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/error/RangeSetShouldEnclose_create_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.error;
+package org.assertj.guava.tests.error;
import static com.google.common.collect.ImmutableRangeSet.of;
import static com.google.common.collect.Range.closed;
@@ -24,6 +24,7 @@
import org.assertj.core.description.TextDescription;
import org.assertj.core.error.ErrorMessageFactory;
import org.assertj.core.presentation.StandardRepresentation;
+import org.assertj.guava.error.RangeSetShouldEnclose;
import org.junit.jupiter.api.Test;
/**
diff --git a/assertj-guava/src/test/java/org/assertj/guava/error/RangeSetShouldIntersectAnyOf_create_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/error/RangeSetShouldIntersectAnyOf_create_Test.java
similarity index 95%
rename from assertj-guava/src/test/java/org/assertj/guava/error/RangeSetShouldIntersectAnyOf_create_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/error/RangeSetShouldIntersectAnyOf_create_Test.java
index ce444126ea..86291c3763 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/error/RangeSetShouldIntersectAnyOf_create_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/error/RangeSetShouldIntersectAnyOf_create_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.error;
+package org.assertj.guava.tests.error;
import static com.google.common.collect.ImmutableRangeSet.of;
import static com.google.common.collect.Range.closed;
@@ -23,6 +23,7 @@
import org.assertj.core.description.TextDescription;
import org.assertj.core.error.ErrorMessageFactory;
import org.assertj.core.presentation.StandardRepresentation;
+import org.assertj.guava.error.RangeSetShouldIntersectAnyOf;
import org.junit.jupiter.api.Test;
/**
diff --git a/assertj-guava/src/test/java/org/assertj/guava/error/RangeSetShouldIntersect_create_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/error/RangeSetShouldIntersect_create_Test.java
similarity index 96%
rename from assertj-guava/src/test/java/org/assertj/guava/error/RangeSetShouldIntersect_create_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/error/RangeSetShouldIntersect_create_Test.java
index c50d602aef..9a2914407a 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/error/RangeSetShouldIntersect_create_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/error/RangeSetShouldIntersect_create_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.error;
+package org.assertj.guava.tests.error;
import static com.google.common.collect.ImmutableRangeSet.of;
import static com.google.common.collect.Range.closed;
@@ -24,6 +24,7 @@
import org.assertj.core.description.TextDescription;
import org.assertj.core.error.ErrorMessageFactory;
import org.assertj.core.presentation.StandardRepresentation;
+import org.assertj.guava.error.RangeSetShouldIntersect;
import org.junit.jupiter.api.Test;
/**
diff --git a/assertj-guava/src/test/java/org/assertj/guava/error/RangeSetShouldNotEnclose_create_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/error/RangeSetShouldNotEnclose_create_Test.java
similarity index 96%
rename from assertj-guava/src/test/java/org/assertj/guava/error/RangeSetShouldNotEnclose_create_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/error/RangeSetShouldNotEnclose_create_Test.java
index 7a8aaa4b36..8af0fc44ad 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/error/RangeSetShouldNotEnclose_create_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/error/RangeSetShouldNotEnclose_create_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.error;
+package org.assertj.guava.tests.error;
import static com.google.common.collect.ImmutableRangeSet.of;
import static com.google.common.collect.Range.closed;
@@ -24,6 +24,7 @@
import org.assertj.core.description.TextDescription;
import org.assertj.core.error.ErrorMessageFactory;
import org.assertj.core.presentation.StandardRepresentation;
+import org.assertj.guava.error.RangeSetShouldNotEnclose;
import org.junit.jupiter.api.Test;
/**
diff --git a/assertj-guava/src/test/java/org/assertj/guava/error/RangeSetShouldNotIntersect_create_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/error/RangeSetShouldNotIntersect_create_Test.java
similarity index 96%
rename from assertj-guava/src/test/java/org/assertj/guava/error/RangeSetShouldNotIntersect_create_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/error/RangeSetShouldNotIntersect_create_Test.java
index dd3af4b6cd..eeca871136 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/error/RangeSetShouldNotIntersect_create_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/error/RangeSetShouldNotIntersect_create_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.error;
+package org.assertj.guava.tests.error;
import static com.google.common.collect.ImmutableRangeSet.of;
import static com.google.common.collect.Range.closed;
@@ -24,6 +24,7 @@
import org.assertj.core.description.TextDescription;
import org.assertj.core.error.ErrorMessageFactory;
import org.assertj.core.presentation.StandardRepresentation;
+import org.assertj.guava.error.RangeSetShouldNotIntersect;
import org.junit.jupiter.api.Test;
/**
diff --git a/assertj-guava/src/test/java/org/assertj/guava/error/ShouldHaveSameContentTest_create_Test.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/error/ShouldHaveSameContentTest_create_Test.java
similarity index 97%
rename from assertj-guava/src/test/java/org/assertj/guava/error/ShouldHaveSameContentTest_create_Test.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/error/ShouldHaveSameContentTest_create_Test.java
index 8827cde846..a6cb2167ec 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/error/ShouldHaveSameContentTest_create_Test.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/error/ShouldHaveSameContentTest_create_Test.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.error;
+package org.assertj.guava.tests.error;
import static java.lang.String.format;
import static org.assertj.core.api.BDDAssertions.then;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/testkit/AssertionErrors.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/testkit/AssertionErrors.java
similarity index 96%
rename from assertj-guava/src/test/java/org/assertj/guava/testkit/AssertionErrors.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/testkit/AssertionErrors.java
index 1859909e1e..23d97a12e3 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/testkit/AssertionErrors.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/testkit/AssertionErrors.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.testkit;
+package org.assertj.guava.tests.testkit;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowableOfType;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/testkit/junit/jupiter/DefaultDisplayNameGenerator.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/testkit/junit/jupiter/DefaultDisplayNameGenerator.java
similarity index 95%
rename from assertj-guava/src/test/java/org/assertj/guava/testkit/junit/jupiter/DefaultDisplayNameGenerator.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/testkit/junit/jupiter/DefaultDisplayNameGenerator.java
index 650ed2eef7..943232c7de 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/testkit/junit/jupiter/DefaultDisplayNameGenerator.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/testkit/junit/jupiter/DefaultDisplayNameGenerator.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.testkit.junit.jupiter;
+package org.assertj.guava.tests.testkit.junit.jupiter;
import org.junit.jupiter.api.DisplayNameGenerator;
diff --git a/assertj-guava/src/test/java/org/assertj/guava/testkit/junit/jupiter/DefaultDisplayNameGeneratorTest.java b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/testkit/junit/jupiter/DefaultDisplayNameGeneratorTest.java
similarity index 82%
rename from assertj-guava/src/test/java/org/assertj/guava/testkit/junit/jupiter/DefaultDisplayNameGeneratorTest.java
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/testkit/junit/jupiter/DefaultDisplayNameGeneratorTest.java
index a0a3bc2cb8..501f9b764b 100644
--- a/assertj-guava/src/test/java/org/assertj/guava/testkit/junit/jupiter/DefaultDisplayNameGeneratorTest.java
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/org/assertj/guava/tests/testkit/junit/jupiter/DefaultDisplayNameGeneratorTest.java
@@ -10,7 +10,7 @@
*
* Copyright 2012-2024 the original author or authors.
*/
-package org.assertj.guava.testkit.junit.jupiter;
+package org.assertj.guava.tests.testkit.junit.jupiter;
import static org.assertj.core.api.BDDAssertions.then;
@@ -23,8 +23,8 @@ class DefaultDisplayNameGeneratorTest {
@ParameterizedTest
@CsvSource({
- "org.assertj.guava.testkit.junit.jupiter.SomeAssert_someMethod_Test, SomeAssert someMethod",
- "org.assertj.guava.testkit.junit.jupiter.SomeAssert_someMethod_with_SomeType_Test, SomeAssert someMethod with SomeType"
+ "org.assertj.guava.tests.testkit.junit.jupiter.SomeAssert_someMethod_Test, SomeAssert someMethod",
+ "org.assertj.guava.tests.testkit.junit.jupiter.SomeAssert_someMethod_with_SomeType_Test, SomeAssert someMethod with SomeType"
})
void generateDisplayNameForClass_should_remove_test_suffix(Class> testClass, String expected) {
// WHEN
diff --git a/assertj-guava/src/test/resources/junit-platform.properties b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/resources/junit-platform.properties
similarity index 54%
rename from assertj-guava/src/test/resources/junit-platform.properties
rename to assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/resources/junit-platform.properties
index ce448dafc2..ccc23df84b 100644
--- a/assertj-guava/src/test/resources/junit-platform.properties
+++ b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/src/test/resources/junit-platform.properties
@@ -1 +1 @@
-junit.jupiter.displayname.generator.default=org.assertj.guava.testkit.junit.jupiter.DefaultDisplayNameGenerator
+junit.jupiter.displayname.generator.default=org.assertj.guava.tests.testkit.junit.jupiter.DefaultDisplayNameGenerator
diff --git a/assertj-tests/assertj-integration-tests/pom.xml b/assertj-tests/assertj-integration-tests/pom.xml
index 25fdefc4e5..4e4b8dd756 100644
--- a/assertj-tests/assertj-integration-tests/pom.xml
+++ b/assertj-tests/assertj-integration-tests/pom.xml
@@ -19,6 +19,7 @@
assertj-core-kotlin
assertj-core-osgi
assertj-core-testng-with-junit4
+ assertj-guava-module-path