diff --git a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThatComparable_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThatComparable_Test.java index 7925d569cc..396e213325 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThatComparable_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThatComparable_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatComparable; import static org.assertj.core.api.BDDAssertions.then; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Name; import org.junit.jupiter.api.Test; class Assertions_assertThatComparable_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThatException_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThatException_Test.java index af7bc0f65d..dca7916ab3 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThatException_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThatException_Test.java @@ -15,7 +15,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatException; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.ThrowingCallableFactory.codeThrowing; +import static org.assertj.core.testkit.ThrowingCallableFactory.codeThrowing; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.ThrowableAssert.ThrowingCallable; diff --git a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThatIndexOutOfBoundsException_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThatIndexOutOfBoundsException_Test.java index 3b554358ed..4a7c8fc242 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThatIndexOutOfBoundsException_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThatIndexOutOfBoundsException_Test.java @@ -15,7 +15,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatIndexOutOfBoundsException; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.ThrowingCallableFactory.codeThrowing; +import static org.assertj.core.testkit.ThrowingCallableFactory.codeThrowing; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.ThrowableAssert.ThrowingCallable; diff --git a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThatReflectiveOperationException_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThatReflectiveOperationException_Test.java index 1b15527fa4..b005adb75d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThatReflectiveOperationException_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThatReflectiveOperationException_Test.java @@ -15,7 +15,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatReflectiveOperationException; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.ThrowingCallableFactory.codeThrowing; +import static org.assertj.core.testkit.ThrowingCallableFactory.codeThrowing; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.ThrowableAssert.ThrowingCallable; diff --git a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThatRuntimeException_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThatRuntimeException_Test.java index 8d1340e52d..3b2a15958d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThatRuntimeException_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThatRuntimeException_Test.java @@ -15,7 +15,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatRuntimeException; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.ThrowingCallableFactory.codeThrowing; +import static org.assertj.core.testkit.ThrowingCallableFactory.codeThrowing; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.ThrowableAssert.ThrowingCallable; diff --git a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThatStream_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThatStream_Test.java index 1e46b6b130..292a193937 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThatStream_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThatStream_Test.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.stream.Stream; -import org.assertj.core.test.StringStream; +import org.assertj.core.testkit.StringStream; import org.junit.jupiter.api.Test; class Assertions_assertThatStream_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_inBinary_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_inBinary_Test.java index 19af23bba7..6b9478c3e6 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_inBinary_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_inBinary_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_inHexadecimal_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_inHexadecimal_Test.java index 1e6b1c5811..7faca6ea3b 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_inHexadecimal_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_inHexadecimal_Test.java @@ -15,7 +15,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.Lists.list; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_inUnicode_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_inUnicode_Test.java index 1f613087c1..1d2ecf7f72 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_inUnicode_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_inUnicode_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_BooleanArray_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_BooleanArray_Test.java index 0b85f3634b..0cc06a707c 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_BooleanArray_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_BooleanArray_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.BooleanArrays.emptyArray; +import static org.assertj.core.testkit.BooleanArrays.emptyArray; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_ByteArray_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_ByteArray_Test.java index 26a5c2a082..a6bb932aaf 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_ByteArray_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_ByteArray_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.ByteArrays.emptyArray; +import static org.assertj.core.testkit.ByteArrays.emptyArray; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_CharArray_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_CharArray_Test.java index 37fdf1030d..51b94f2dc8 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_CharArray_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_CharArray_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.CharArrays.emptyArray; +import static org.assertj.core.testkit.CharArrays.emptyArray; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_Comparable_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_Comparable_Test.java index 708f50823e..ba9341b734 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_Comparable_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_Comparable_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.BDDAssertions.then; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Name; import org.junit.jupiter.api.Test; class Assertions_assertThat_with_Comparable_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_DoubleArray_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_DoubleArray_Test.java index e4d1aae235..581ac4b115 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_DoubleArray_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_DoubleArray_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.DoubleArrays.emptyArray; +import static org.assertj.core.testkit.DoubleArrays.emptyArray; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_FloatArray_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_FloatArray_Test.java index f5aef32927..48035d3140 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_FloatArray_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_FloatArray_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.FloatArrays.emptyArray; +import static org.assertj.core.testkit.FloatArrays.emptyArray; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_IntArray_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_IntArray_Test.java index 55a55807ef..09dbbef457 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_IntArray_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_IntArray_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.IntArrays.emptyArray; +import static org.assertj.core.testkit.IntArrays.emptyArray; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_LongArray_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_LongArray_Test.java index 0165f30551..bb90b145c7 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_LongArray_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_LongArray_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.LongArrays.emptyArray; +import static org.assertj.core.testkit.LongArrays.emptyArray; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_ObjectArray_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_ObjectArray_Test.java index b2c4275d28..014f8d8986 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_ObjectArray_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_ObjectArray_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_ShortArray_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_ShortArray_Test.java index 62dd653fb1..64e22b804d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_ShortArray_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_ShortArray_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.ShortArrays.emptyArray; +import static org.assertj.core.testkit.ShortArrays.emptyArray; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_Spliterator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_Spliterator_Test.java index 667d6efb95..977509534d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_Spliterator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_Spliterator_Test.java @@ -18,7 +18,7 @@ import java.util.Spliterator; import java.util.stream.Stream; -import org.assertj.core.test.StringSpliterator; +import org.assertj.core.testkit.StringSpliterator; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_Stream_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_Stream_Test.java index e467c1089f..6ac3f76103 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_Stream_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_Stream_Test.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.stream.Stream; -import org.assertj.core.test.StringStream; +import org.assertj.core.testkit.StringStream; import org.junit.jupiter.api.Test; class Assertions_assertThat_with_Stream_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_Stream_startsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_Stream_startsWith_Test.java index ddff03acae..ce904d7438 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_Stream_startsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_Stream_startsWith_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; @@ -24,7 +24,7 @@ import java.util.List; import java.util.stream.Stream; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_Throwable_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_Throwable_Test.java index 91c88d3504..1d27f2d9f0 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_Throwable_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertThat_with_Throwable_Test.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.Assertions.catchThrowableOfType; import static org.assertj.core.presentation.StandardRepresentation.STANDARD_REPRESENTATION; -import static org.assertj.core.test.ThrowingCallableFactory.codeThrowing; +import static org.assertj.core.testkit.ThrowingCallableFactory.codeThrowing; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; diff --git a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertWith_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertWith_Test.java index d83e4b9ee6..9a69b2fd6d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Assertions_assertWith_Test.java @@ -18,7 +18,7 @@ import java.util.function.Consumer; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.Test; class Assertions_assertWith_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/api/AtomicIntegerArrayAssertBaseTest.java b/assertj-core/src/test/java/org/assertj/core/api/AtomicIntegerArrayAssertBaseTest.java index d1774f3d89..bd6561e934 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/AtomicIntegerArrayAssertBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/AtomicIntegerArrayAssertBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api; -import static org.assertj.core.test.IntArrays.emptyArray; +import static org.assertj.core.testkit.IntArrays.emptyArray; import static org.assertj.core.util.Arrays.array; import static org.mockito.Mockito.mock; diff --git a/assertj-core/src/test/java/org/assertj/core/api/AtomicLongArrayAssertBaseTest.java b/assertj-core/src/test/java/org/assertj/core/api/AtomicLongArrayAssertBaseTest.java index d48e2045be..f4580c8e6c 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/AtomicLongArrayAssertBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/AtomicLongArrayAssertBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api; -import static org.assertj.core.test.LongArrays.emptyArray; +import static org.assertj.core.testkit.LongArrays.emptyArray; import static org.assertj.core.util.Arrays.array; import static org.mockito.Mockito.mock; diff --git a/assertj-core/src/test/java/org/assertj/core/api/AtomicReferenceArrayAssertBaseTest.java b/assertj-core/src/test/java/org/assertj/core/api/AtomicReferenceArrayAssertBaseTest.java index bc7c2a070d..9a7c539940 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/AtomicReferenceArrayAssertBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/AtomicReferenceArrayAssertBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api; -import static org.assertj.core.test.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; import static org.assertj.core.util.Arrays.array; import static org.mockito.Mockito.mock; diff --git a/assertj-core/src/test/java/org/assertj/core/api/AutoCloseableBDDSoftAssertionsTest.java b/assertj-core/src/test/java/org/assertj/core/api/AutoCloseableBDDSoftAssertionsTest.java index c2d5fe70c0..7d54026140 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/AutoCloseableBDDSoftAssertionsTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/AutoCloseableBDDSoftAssertionsTest.java @@ -16,8 +16,8 @@ import static java.util.stream.Collectors.toList; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.Maps.mapOf; import static org.assertj.core.util.DateUtil.parseDatetime; import static org.assertj.core.util.Lists.list; diff --git a/assertj-core/src/test/java/org/assertj/core/api/AutoCloseableSoftAssertionsTest.java b/assertj-core/src/test/java/org/assertj/core/api/AutoCloseableSoftAssertionsTest.java index 115e26583d..bce4b1f7d3 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/AutoCloseableSoftAssertionsTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/AutoCloseableSoftAssertionsTest.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.assertj.core.data.MapEntry.entry; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.Maps.mapOf; import static org.assertj.core.util.DateUtil.parseDatetime; import static org.assertj.core.util.Lists.list; diff --git a/assertj-core/src/test/java/org/assertj/core/api/BDDSoftAssertionsTest.java b/assertj-core/src/test/java/org/assertj/core/api/BDDSoftAssertionsTest.java index 15c4948791..4887347e5d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/BDDSoftAssertionsTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/BDDSoftAssertionsTest.java @@ -31,9 +31,9 @@ import static org.assertj.core.data.TolkienCharacter.Race.ELF; import static org.assertj.core.data.TolkienCharacter.Race.HOBBIT; import static org.assertj.core.data.TolkienCharacter.Race.MAN; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.Name.name; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.Name.name; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.DateUtil.parseDatetime; import static org.assertj.core.util.Lists.list; @@ -95,10 +95,10 @@ import org.assertj.core.api.test.ComparableExample; import org.assertj.core.data.MapEntry; import org.assertj.core.data.TolkienCharacter; -import org.assertj.core.test.Animal; -import org.assertj.core.test.CartoonCharacter; -import org.assertj.core.test.Name; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Animal; +import org.assertj.core.testkit.CartoonCharacter; +import org.assertj.core.testkit.Name; +import org.assertj.core.testkit.Person; import org.assertj.core.util.VisibleForTesting; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; diff --git a/assertj-core/src/test/java/org/assertj/core/api/BDDSoftAssertions_ThrowableTypeAssert_Test.java b/assertj-core/src/test/java/org/assertj/core/api/BDDSoftAssertions_ThrowableTypeAssert_Test.java index 5e02492385..e769dff617 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/BDDSoftAssertions_ThrowableTypeAssert_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/BDDSoftAssertions_ThrowableTypeAssert_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.ThrowingCallableFactory.codeThrowing; +import static org.assertj.core.testkit.ThrowingCallableFactory.codeThrowing; import static org.junit.jupiter.params.provider.Arguments.arguments; import java.io.IOException; diff --git a/assertj-core/src/test/java/org/assertj/core/api/BaseAssertionsTest.java b/assertj-core/src/test/java/org/assertj/core/api/BaseAssertionsTest.java index bbfaff998d..d7a02663cb 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/BaseAssertionsTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/BaseAssertionsTest.java @@ -13,7 +13,7 @@ package org.assertj.core.api; import static org.assertj.core.api.Assertions.setRemoveAssertJRelatedElementsFromStackTrace; -import static org.assertj.core.test.TypeCanonizer.canonize; +import static org.assertj.core.testkit.TypeCanonizer.canonize; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.Sets.newLinkedHashSet; diff --git a/assertj-core/src/test/java/org/assertj/core/api/BooleanArrayAssertBaseTest.java b/assertj-core/src/test/java/org/assertj/core/api/BooleanArrayAssertBaseTest.java index 409efe8cbe..f140c10458 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/BooleanArrayAssertBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/BooleanArrayAssertBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api; -import static org.assertj.core.test.BooleanArrays.emptyArray; +import static org.assertj.core.testkit.BooleanArrays.emptyArray; import static org.mockito.Mockito.mock; import org.assertj.core.internal.BooleanArrays; diff --git a/assertj-core/src/test/java/org/assertj/core/api/ByteArrayAssertBaseTest.java b/assertj-core/src/test/java/org/assertj/core/api/ByteArrayAssertBaseTest.java index 8f4f944503..2077e72525 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/ByteArrayAssertBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/ByteArrayAssertBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api; -import static org.assertj.core.test.ByteArrays.emptyArray; +import static org.assertj.core.testkit.ByteArrays.emptyArray; import static org.mockito.Mockito.mock; import org.assertj.core.internal.ByteArrays; diff --git a/assertj-core/src/test/java/org/assertj/core/api/CharArrayAssertBaseTest.java b/assertj-core/src/test/java/org/assertj/core/api/CharArrayAssertBaseTest.java index b7afe0cacf..89e1d6fe4e 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/CharArrayAssertBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/CharArrayAssertBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api; -import static org.assertj.core.test.CharArrays.emptyArray; +import static org.assertj.core.testkit.CharArrays.emptyArray; import static org.mockito.Mockito.mock; import org.assertj.core.internal.CharArrays; diff --git a/assertj-core/src/test/java/org/assertj/core/api/Condition_as_Description_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Condition_as_Description_Test.java index 2d10787ae6..ab5320acd5 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Condition_as_Description_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Condition_as_Description_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.description.EmptyTextDescription.emptyDescription; -import static org.assertj.core.test.TestData.someTextDescription; +import static org.assertj.core.testkit.TestData.someTextDescription; import org.assertj.core.description.Description; import org.assertj.core.internal.TestDescription; diff --git a/assertj-core/src/test/java/org/assertj/core/api/Condition_as_String_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Condition_as_String_Test.java index 7fd1145145..5905392a84 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Condition_as_String_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Condition_as_String_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.TestData.someTextDescription; +import static org.assertj.core.testkit.TestData.someTextDescription; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/Condition_describedAs_Description_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Condition_describedAs_Description_Test.java index b20230c120..05c1d0fade 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Condition_describedAs_Description_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Condition_describedAs_Description_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.TestData.someTextDescription; +import static org.assertj.core.testkit.TestData.someTextDescription; import org.assertj.core.description.Description; import org.assertj.core.internal.TestDescription; diff --git a/assertj-core/src/test/java/org/assertj/core/api/Condition_describedAs_String_Test.java b/assertj-core/src/test/java/org/assertj/core/api/Condition_describedAs_String_Test.java index d98fe357c6..203c63b220 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Condition_describedAs_String_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Condition_describedAs_String_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.TestData.someTextDescription; +import static org.assertj.core.testkit.TestData.someTextDescription; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/DoubleArrayAssertBaseTest.java b/assertj-core/src/test/java/org/assertj/core/api/DoubleArrayAssertBaseTest.java index 6cacadaa6b..2ccadabbd4 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/DoubleArrayAssertBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/DoubleArrayAssertBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api; -import static org.assertj.core.test.DoubleArrays.emptyArray; +import static org.assertj.core.testkit.DoubleArrays.emptyArray; import static org.mockito.Mockito.mock; import org.assertj.core.internal.DoubleArrays; diff --git a/assertj-core/src/test/java/org/assertj/core/api/DoubleAssertBaseTest.java b/assertj-core/src/test/java/org/assertj/core/api/DoubleAssertBaseTest.java index aa23ca5084..bd122a64a0 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/DoubleAssertBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/DoubleAssertBaseTest.java @@ -16,7 +16,7 @@ import org.assertj.core.internal.Comparables; import org.assertj.core.internal.Doubles; -import org.assertj.core.test.AlwaysEqualComparator; +import org.assertj.core.testkit.AlwaysEqualComparator; /** * Base class for {@link DoubleAssert} tests. diff --git a/assertj-core/src/test/java/org/assertj/core/api/EntryPointAssertions_useDefaultRepresentation_Test.java b/assertj-core/src/test/java/org/assertj/core/api/EntryPointAssertions_useDefaultRepresentation_Test.java index a6134da206..09979245a9 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/EntryPointAssertions_useDefaultRepresentation_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/EntryPointAssertions_useDefaultRepresentation_Test.java @@ -21,7 +21,7 @@ import org.apache.commons.lang3.tuple.Pair; import org.assertj.core.presentation.Representation; -import org.assertj.core.test.MutatesGlobalConfiguration; +import org.assertj.core.testkit.MutatesGlobalConfiguration; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.params.ParameterizedTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/EntryPoint_Assumptions_setPreferredAssumptionException_Test.java b/assertj-core/src/test/java/org/assertj/core/api/EntryPoint_Assumptions_setPreferredAssumptionException_Test.java index 4b9c469785..4cc60b8bdb 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/EntryPoint_Assumptions_setPreferredAssumptionException_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/EntryPoint_Assumptions_setPreferredAssumptionException_Test.java @@ -28,7 +28,7 @@ import java.util.stream.Stream; import org.assertj.core.configuration.PreferredAssumptionException; -import org.assertj.core.test.MutatesGlobalConfiguration; +import org.assertj.core.testkit.MutatesGlobalConfiguration; import org.junit.AssumptionViolatedException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.params.ParameterizedTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/FloatArrayAssertBaseTest.java b/assertj-core/src/test/java/org/assertj/core/api/FloatArrayAssertBaseTest.java index f2e4df1ac5..4ebd2b7b7c 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/FloatArrayAssertBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/FloatArrayAssertBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api; -import static org.assertj.core.test.FloatArrays.emptyArray; +import static org.assertj.core.testkit.FloatArrays.emptyArray; import static org.mockito.Mockito.mock; import org.assertj.core.internal.FloatArrays; diff --git a/assertj-core/src/test/java/org/assertj/core/api/FloatAssertBaseTest.java b/assertj-core/src/test/java/org/assertj/core/api/FloatAssertBaseTest.java index 93395dd27a..8b6e03bb79 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/FloatAssertBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/FloatAssertBaseTest.java @@ -16,7 +16,7 @@ import org.assertj.core.internal.Comparables; import org.assertj.core.internal.Floats; -import org.assertj.core.test.AlwaysEqualComparator; +import org.assertj.core.testkit.AlwaysEqualComparator; /** * Base class for {@link FloatAssert} tests. diff --git a/assertj-core/src/test/java/org/assertj/core/api/GroupAssertTestHelper.java b/assertj-core/src/test/java/org/assertj/core/api/GroupAssertTestHelper.java index a24cd7863a..944a2028ab 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/GroupAssertTestHelper.java +++ b/assertj-core/src/test/java/org/assertj/core/api/GroupAssertTestHelper.java @@ -17,7 +17,7 @@ import org.assertj.core.api.iterable.ThrowingExtractor; import org.assertj.core.internal.TypeComparators; -import org.assertj.core.test.Employee; +import org.assertj.core.testkit.Employee; import org.assertj.core.util.introspection.PropertyOrFieldSupport; public class GroupAssertTestHelper { diff --git a/assertj-core/src/test/java/org/assertj/core/api/InstanceOfAssertFactoriesTest.java b/assertj-core/src/test/java/org/assertj/core/api/InstanceOfAssertFactoriesTest.java index f30edef358..129be740a9 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/InstanceOfAssertFactoriesTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/InstanceOfAssertFactoriesTest.java @@ -131,7 +131,7 @@ import static org.assertj.core.api.InstanceOfAssertFactories.stream; import static org.assertj.core.api.InstanceOfAssertFactories.throwable; import static org.assertj.core.api.InstanceOfAssertFactories.type; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS; import static org.mockito.AdditionalAnswers.delegatesTo; import static org.mockito.ArgumentMatchers.argThat; diff --git a/assertj-core/src/test/java/org/assertj/core/api/IntArrayAssertBaseTest.java b/assertj-core/src/test/java/org/assertj/core/api/IntArrayAssertBaseTest.java index 814afba0c5..e90c4c7f64 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/IntArrayAssertBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/IntArrayAssertBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api; -import static org.assertj.core.test.IntArrays.emptyArray; +import static org.assertj.core.testkit.IntArrays.emptyArray; import static org.mockito.Mockito.mock; import org.assertj.core.internal.IntArrays; diff --git a/assertj-core/src/test/java/org/assertj/core/api/JUnitBDDSoftAssertionsFailureTest.java b/assertj-core/src/test/java/org/assertj/core/api/JUnitBDDSoftAssertionsFailureTest.java index 4d624c2f95..fc77b6177c 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/JUnitBDDSoftAssertionsFailureTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/JUnitBDDSoftAssertionsFailureTest.java @@ -15,7 +15,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowableOfType; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.Lists.list; import static org.mockito.Mockito.mock; diff --git a/assertj-core/src/test/java/org/assertj/core/api/JUnitSoftAssertionsFailureTest.java b/assertj-core/src/test/java/org/assertj/core/api/JUnitSoftAssertionsFailureTest.java index 275c29e677..5513e9ea16 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/JUnitSoftAssertionsFailureTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/JUnitSoftAssertionsFailureTest.java @@ -15,7 +15,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowableOfType; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.Lists.list; import static org.mockito.Mockito.mock; diff --git a/assertj-core/src/test/java/org/assertj/core/api/Java6JUnitBDDSoftAssertionsFailureTest.java b/assertj-core/src/test/java/org/assertj/core/api/Java6JUnitBDDSoftAssertionsFailureTest.java index eca5723dfb..56e6ae24c4 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Java6JUnitBDDSoftAssertionsFailureTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Java6JUnitBDDSoftAssertionsFailureTest.java @@ -15,7 +15,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.Lists.list; import java.util.List; diff --git a/assertj-core/src/test/java/org/assertj/core/api/Java6JUnitSoftAssertionsFailureTest.java b/assertj-core/src/test/java/org/assertj/core/api/Java6JUnitSoftAssertionsFailureTest.java index c15f710e6c..da2d42dd62 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/Java6JUnitSoftAssertionsFailureTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/Java6JUnitSoftAssertionsFailureTest.java @@ -15,7 +15,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import java.util.List; diff --git a/assertj-core/src/test/java/org/assertj/core/api/LongArrayAssertBaseTest.java b/assertj-core/src/test/java/org/assertj/core/api/LongArrayAssertBaseTest.java index 38ebb6c739..74d43ec619 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/LongArrayAssertBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/LongArrayAssertBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api; -import static org.assertj.core.test.LongArrays.emptyArray; +import static org.assertj.core.testkit.LongArrays.emptyArray; import static org.mockito.Mockito.mock; import org.assertj.core.internal.LongArrays; diff --git a/assertj-core/src/test/java/org/assertj/core/api/NavigationMethodBaseTest.java b/assertj-core/src/test/java/org/assertj/core/api/NavigationMethodBaseTest.java index dcc8b20c4f..7a527b8e32 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/NavigationMethodBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/NavigationMethodBaseTest.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS; import java.util.UUID; diff --git a/assertj-core/src/test/java/org/assertj/core/api/ObjectArrayAssertBaseTest.java b/assertj-core/src/test/java/org/assertj/core/api/ObjectArrayAssertBaseTest.java index 89bc6e569a..9292050df2 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/ObjectArrayAssertBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/ObjectArrayAssertBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api; -import static org.assertj.core.test.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; import static org.mockito.Mockito.mock; import org.assertj.core.internal.Iterables; diff --git a/assertj-core/src/test/java/org/assertj/core/api/ObjectAssertBaseTest.java b/assertj-core/src/test/java/org/assertj/core/api/ObjectAssertBaseTest.java index 5eca1bf2eb..e0dcfc9c1b 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/ObjectAssertBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/ObjectAssertBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; /** * Base class for {@link ObjectAssert} tests. diff --git a/assertj-core/src/test/java/org/assertj/core/api/ShortArrayAssertBaseTest.java b/assertj-core/src/test/java/org/assertj/core/api/ShortArrayAssertBaseTest.java index ea8ab148bf..03f850965d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/ShortArrayAssertBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/ShortArrayAssertBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api; -import static org.assertj.core.test.ShortArrays.emptyArray; +import static org.assertj.core.testkit.ShortArrays.emptyArray; import static org.mockito.Mockito.mock; import org.assertj.core.internal.ShortArrays; diff --git a/assertj-core/src/test/java/org/assertj/core/api/SoftAssertionsTest.java b/assertj-core/src/test/java/org/assertj/core/api/SoftAssertionsTest.java index 07283e7356..e39071dcfd 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/SoftAssertionsTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/SoftAssertionsTest.java @@ -36,11 +36,11 @@ import static org.assertj.core.data.TolkienCharacter.Race.HOBBIT; import static org.assertj.core.data.TolkienCharacter.Race.MAN; import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.Name.lastNameComparator; -import static org.assertj.core.test.Name.name; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.Name.lastNameComparator; +import static org.assertj.core.testkit.Name.name; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.DateUtil.parseDatetime; import static org.assertj.core.util.Lists.list; @@ -101,11 +101,11 @@ import org.assertj.core.data.MapEntry; import org.assertj.core.data.TolkienCharacter; import org.assertj.core.data.TolkienCharacterAssert; -import org.assertj.core.test.Animal; -import org.assertj.core.test.CartoonCharacter; -import org.assertj.core.test.CaseInsensitiveStringComparator; -import org.assertj.core.test.Name; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Animal; +import org.assertj.core.testkit.CartoonCharacter; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.Name; +import org.assertj.core.testkit.Person; import org.assertj.core.util.Lists; import org.assertj.core.util.VisibleForTesting; import org.junit.jupiter.api.BeforeEach; diff --git a/assertj-core/src/test/java/org/assertj/core/api/SoftAssertions_ThrowableTypeAssert_Test.java b/assertj-core/src/test/java/org/assertj/core/api/SoftAssertions_ThrowableTypeAssert_Test.java index 1ac4c01594..ac0e801635 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/SoftAssertions_ThrowableTypeAssert_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/SoftAssertions_ThrowableTypeAssert_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.ThrowingCallableFactory.codeThrowing; +import static org.assertj.core.testkit.ThrowingCallableFactory.codeThrowing; import static org.junit.jupiter.params.provider.Arguments.arguments; import java.io.IOException; diff --git a/assertj-core/src/test/java/org/assertj/core/api/SpliteratorAssertBaseTest.java b/assertj-core/src/test/java/org/assertj/core/api/SpliteratorAssertBaseTest.java index 64747807b1..b3958e6c9f 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/SpliteratorAssertBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/SpliteratorAssertBaseTest.java @@ -17,7 +17,7 @@ import java.util.Spliterator; import org.assertj.core.internal.Spliterators; -import org.assertj.core.test.StringSpliterator; +import org.assertj.core.testkit.StringSpliterator; public abstract class SpliteratorAssertBaseTest extends BaseTestTemplate, Spliterator> { diff --git a/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_as_with_description_Test.java b/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_as_with_description_Test.java index 70b711563a..b3f459726f 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_as_with_description_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_as_with_description_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.abstract_; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.TestData.someDescription; +import static org.assertj.core.testkit.TestData.someDescription; import org.assertj.core.api.AbstractAssert; import org.assertj.core.api.ConcreteAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_as_with_text_description_Test.java b/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_as_with_text_description_Test.java index 676f3b5fbd..ed86aa17aa 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_as_with_text_description_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_as_with_text_description_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.abstract_; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.TestData.someTextDescription; +import static org.assertj.core.testkit.TestData.someTextDescription; import org.assertj.core.api.AbstractAssert; import org.assertj.core.api.ConcreteAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_describedAs_with_description_Test.java b/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_describedAs_with_description_Test.java index 1e40776375..928c492062 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_describedAs_with_description_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_describedAs_with_description_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.abstract_; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.TestData.someDescription; +import static org.assertj.core.testkit.TestData.someDescription; import org.assertj.core.api.AbstractAssert; import org.assertj.core.api.ConcreteAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_describedAs_with_text_description_Test.java b/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_describedAs_with_text_description_Test.java index 18ace5fbe2..0da6ecfe45 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_describedAs_with_text_description_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_describedAs_with_text_description_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.abstract_; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.TestData.someTextDescription; +import static org.assertj.core.testkit.TestData.someTextDescription; import org.assertj.core.api.AbstractAssert; import org.assertj.core.api.ConcreteAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_extracting_with_Function_and_AssertFactory_Test.java b/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_extracting_with_Function_and_AssertFactory_Test.java index 4ce15e8571..e7b569e938 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_extracting_with_Function_and_AssertFactory_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_extracting_with_Function_and_AssertFactory_Test.java @@ -29,8 +29,8 @@ import org.assertj.core.api.Assertions; import org.assertj.core.api.NavigationMethodBaseTest; import org.assertj.core.api.abstract_.AbstractAssert_extracting_with_Function_and_AssertFactory_Test.TestAssert; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_extracting_with_String_and_AssertFactory_Test.java b/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_extracting_with_String_and_AssertFactory_Test.java index c5717d71c1..2f70c09917 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_extracting_with_String_and_AssertFactory_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_extracting_with_String_and_AssertFactory_Test.java @@ -25,8 +25,8 @@ import org.assertj.core.api.Assertions; import org.assertj.core.api.NavigationMethodBaseTest; import org.assertj.core.api.abstract_.AbstractAssert_extracting_with_String_and_AssertFactory_Test.TestAssert; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.assertj.core.util.introspection.IntrospectionError; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_isInstanceOfSatisfying_Test.java b/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_isInstanceOfSatisfying_Test.java index b762c77c1b..1f5b1667e1 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_isInstanceOfSatisfying_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_isInstanceOfSatisfying_Test.java @@ -24,7 +24,7 @@ import org.assertj.core.api.AbstractAssertBaseTest; import org.assertj.core.api.ConcreteAssert; import org.assertj.core.api.ThrowableAssert.ThrowingCallable; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_satisfies_with_Consumers_Test.java b/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_satisfies_with_Consumers_Test.java index 2782491267..4b88f633c1 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_satisfies_with_Consumers_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_satisfies_with_Consumers_Test.java @@ -21,7 +21,7 @@ import java.util.function.Consumer; import org.assertj.core.api.AbstractAssert; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.Test; class AbstractAssert_satisfies_with_Consumers_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_withRepresentation_Test.java b/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_withRepresentation_Test.java index e7702e9325..131775e875 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_withRepresentation_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_withRepresentation_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNullPointerException; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import org.assertj.core.presentation.StandardRepresentation; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/abstract_/SoftAssertionsMultipleProjectsTest.java b/assertj-core/src/test/java/org/assertj/core/api/abstract_/SoftAssertionsMultipleProjectsTest.java index 004ad2328f..f13ea9b33c 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/abstract_/SoftAssertionsMultipleProjectsTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/abstract_/SoftAssertionsMultipleProjectsTest.java @@ -13,7 +13,7 @@ package org.assertj.core.api.abstract_; // Make sure that package-private access is lost import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import java.util.List; diff --git a/assertj-core/src/test/java/org/assertj/core/api/assumptions/Assumptions_assumeThat_Test.java b/assertj-core/src/test/java/org/assertj/core/api/assumptions/Assumptions_assumeThat_Test.java index f0193fcae2..cc17dd5eaa 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/assumptions/Assumptions_assumeThat_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/assumptions/Assumptions_assumeThat_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; import static org.assertj.core.util.AssertionsUtil.expectAssumptionNotMetException; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; class Assumptions_assumeThat_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/api/assumptions/Assumptions_assumeThat_involving_iterable_navigation_Test.java b/assertj-core/src/test/java/org/assertj/core/api/assumptions/Assumptions_assumeThat_involving_iterable_navigation_Test.java index 5c715f8516..a05f5c8877 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/assumptions/Assumptions_assumeThat_involving_iterable_navigation_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/assumptions/Assumptions_assumeThat_involving_iterable_navigation_Test.java @@ -23,7 +23,7 @@ import java.util.Set; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/assumptions/Assumptions_assumeThat_with_extracting_Test.java b/assertj-core/src/test/java/org/assertj/core/api/assumptions/Assumptions_assumeThat_with_extracting_Test.java index 3d6defe4bf..69f8763e60 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/assumptions/Assumptions_assumeThat_with_extracting_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/assumptions/Assumptions_assumeThat_with_extracting_Test.java @@ -16,15 +16,15 @@ import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.entry; import static org.assertj.core.api.Assumptions.assumeThat; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import static org.assertj.core.util.AssertionsUtil.expectAssumptionNotMetException; import static org.assertj.core.util.Lists.newArrayList; import java.util.Map; import java.util.Set; -import org.assertj.core.test.CartoonCharacter; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.CartoonCharacter; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/assumptions/Assumptions_assumeThat_with_filteredOn_Test.java b/assertj-core/src/test/java/org/assertj/core/api/assumptions/Assumptions_assumeThat_with_filteredOn_Test.java index e7e85430b9..a0cc3d1b4c 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/assumptions/Assumptions_assumeThat_with_filteredOn_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/assumptions/Assumptions_assumeThat_with_filteredOn_Test.java @@ -19,7 +19,7 @@ import java.util.Set; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/assumptions/BaseAssumptionsRunnerTest.java b/assertj-core/src/test/java/org/assertj/core/api/assumptions/BaseAssumptionsRunnerTest.java index 1e97963124..3cb488a7e1 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/assumptions/BaseAssumptionsRunnerTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/assumptions/BaseAssumptionsRunnerTest.java @@ -21,7 +21,7 @@ import org.assertj.core.api.iterable.ThrowingExtractor; import org.assertj.core.data.TolkienCharacter; import org.assertj.core.data.TolkienCharacter.Race; -import org.assertj.core.test.CartoonCharacter; +import org.assertj.core.testkit.CartoonCharacter; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; diff --git a/assertj-core/src/test/java/org/assertj/core/api/assumptions/Iterable_special_assertion_methods_in_assumptions_Test.java b/assertj-core/src/test/java/org/assertj/core/api/assumptions/Iterable_special_assertion_methods_in_assumptions_Test.java index c54046c713..43711872ac 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/assumptions/Iterable_special_assertion_methods_in_assumptions_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/assumptions/Iterable_special_assertion_methods_in_assumptions_Test.java @@ -24,7 +24,7 @@ import org.assertj.core.api.Condition; import org.assertj.core.api.IterableAssert; import org.assertj.core.data.TolkienCharacter; -import org.assertj.core.test.CartoonCharacter; +import org.assertj.core.testkit.CartoonCharacter; /** * verify that assertions final methods or methods changing the object under test in {@link IterableAssert} work with assumptions diff --git a/assertj-core/src/test/java/org/assertj/core/api/assumptions/List_special_assertion_methods_in_assumptions_Test.java b/assertj-core/src/test/java/org/assertj/core/api/assumptions/List_special_assertion_methods_in_assumptions_Test.java index 189cd3dfe8..737ba75d25 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/assumptions/List_special_assertion_methods_in_assumptions_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/assumptions/List_special_assertion_methods_in_assumptions_Test.java @@ -25,7 +25,7 @@ import org.assertj.core.api.Condition; import org.assertj.core.api.ListAssert; import org.assertj.core.data.TolkienCharacter; -import org.assertj.core.test.CartoonCharacter; +import org.assertj.core.testkit.CartoonCharacter; /** * verify that assertions final methods or methods changing the object under test in {@link ListAssert} work with assumptions diff --git a/assertj-core/src/test/java/org/assertj/core/api/assumptions/Map_special_assertion_methods_in_assumptions_Test.java b/assertj-core/src/test/java/org/assertj/core/api/assumptions/Map_special_assertion_methods_in_assumptions_Test.java index d9561b5955..c54b0ca9e1 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/assumptions/Map_special_assertion_methods_in_assumptions_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/assumptions/Map_special_assertion_methods_in_assumptions_Test.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assumptions.assumeThat; import static org.assertj.core.api.InstanceOfAssertFactories.STRING; import static org.assertj.core.api.assumptions.BaseAssumptionRunner.assumptionRunner; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import static org.assertj.core.util.Sets.newLinkedHashSet; import java.util.List; diff --git a/assertj-core/src/test/java/org/assertj/core/api/assumptions/ObjectArray_special_assertion_methods_in_assumptions_Test.java b/assertj-core/src/test/java/org/assertj/core/api/assumptions/ObjectArray_special_assertion_methods_in_assumptions_Test.java index 62391e0f35..8ee7f0298a 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/assumptions/ObjectArray_special_assertion_methods_in_assumptions_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/assumptions/ObjectArray_special_assertion_methods_in_assumptions_Test.java @@ -24,7 +24,7 @@ import org.assertj.core.api.Condition; import org.assertj.core.api.ObjectArrayAssert; import org.assertj.core.data.TolkienCharacter; -import org.assertj.core.test.CartoonCharacter; +import org.assertj.core.testkit.CartoonCharacter; /** * verify that assertions final methods or methods changing the object under test in {@link ObjectArrayAssert} work with assumptions diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsAnyOf_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsAnyOf_Test.java index e523dcff76..6b631fb25f 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsAnyOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsAnyOf_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.integerarray; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicIntegerArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsExactlyInAnyOrder_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsExactlyInAnyOrder_Test.java index 01cf4f13e4..57a3dbc5e4 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsExactlyInAnyOrder_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsExactlyInAnyOrder_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.atomic.integerarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import java.util.concurrent.atomic.AtomicIntegerArray; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsExactly_Test.java index 041cb4cbd5..61890efac1 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsExactly_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.integerarray; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicIntegerArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsOnlyOnce_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsOnlyOnce_Test.java index 2ca479195b..284c470b14 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsOnlyOnce_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsOnlyOnce_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.integerarray; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicIntegerArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsOnly_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsOnly_Test.java index cd77149da2..2827ffd16d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsOnly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsOnly_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.integerarray; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicIntegerArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsSequence_Test.java index db0e3cf092..7fdf3c98a3 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsSequence_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.integerarray; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicIntegerArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsSubsequence_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsSubsequence_Test.java index 342c37b5c4..d7e4274575 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsSubsequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_containsSubsequence_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.integerarray; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicIntegerArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_contains_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_contains_Test.java index 62e33d3355..5f957dfba1 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_contains_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_contains_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.integerarray; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicIntegerArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_contains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_contains_at_Index_Test.java index 21890fa790..b4c5b00342 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_contains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_contains_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.integerarray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicIntegerArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_doesNotContain_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_doesNotContain_Test.java index c90be4f60a..b6503843d9 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_doesNotContain_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_doesNotContain_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.integerarray; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicIntegerArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_doesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_doesNotContain_at_Index_Test.java index ca1536fada..4d741a5b18 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_doesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_doesNotContain_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.integerarray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicIntegerArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_endsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_endsWith_Test.java index 222ed259a6..c5b387f1fa 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_endsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_endsWith_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.integerarray; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicIntegerArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_hasArray_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_hasArray_Test.java index e3b88f332f..2775b6fe77 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_hasArray_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_hasArray_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.atomic.integerarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import java.util.concurrent.atomic.AtomicIntegerArray; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_isSortedAccordingToComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_isSortedAccordingToComparator_Test.java index 3066c2b726..765b55c217 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_isSortedAccordingToComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_isSortedAccordingToComparator_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.integerarray; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import static org.mockito.Mockito.verify; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_startsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_startsWith_Test.java index 03f1b9c100..916303dfcd 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_startsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_startsWith_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.integerarray; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicIntegerArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_usingComparator_Test.java index d31812a113..882b919287 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.atomic.integerarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; import java.util.concurrent.atomic.AtomicIntegerArray; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_usingDefaultComparator_Test.java index e365e20073..c2e4d07a85 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_usingDefaultComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.atomic.integerarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.AtomicIntegerArrayAssert; import org.assertj.core.api.AtomicIntegerArrayAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_usingDefaultElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_usingDefaultElementComparator_Test.java index db5b08d83e..679649a5b0 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_usingDefaultElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_usingDefaultElementComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.atomic.integerarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.AtomicIntegerArrayAssert; import org.assertj.core.api.AtomicIntegerArrayAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_usingElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_usingElementComparator_Test.java index 7244259dac..adc265eaf9 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_usingElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/integerarray/AtomicIntegerArrayAssert_usingElementComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.atomic.integerarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; import java.util.concurrent.atomic.AtomicIntegerArray; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsAnyOf_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsAnyOf_Test.java index e0777c598b..be3725146b 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsAnyOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsAnyOf_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.longarray; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicLongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsExactlyInAnyOrder_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsExactlyInAnyOrder_Test.java index 6eb0698821..3a6839f007 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsExactlyInAnyOrder_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsExactlyInAnyOrder_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.atomic.longarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import java.util.concurrent.atomic.AtomicLongArray; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsExactly_Test.java index f459719297..5211e0b44e 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsExactly_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.longarray; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicLongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsOnlyOnce_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsOnlyOnce_Test.java index 2462f4c5f2..e72503c5ab 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsOnlyOnce_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsOnlyOnce_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.longarray; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicLongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsOnly_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsOnly_Test.java index 0d683e3a5e..5c34b8691d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsOnly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsOnly_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.longarray; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicLongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsSequence_Test.java index 879bc87e64..588ee44e7e 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsSequence_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.longarray; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicLongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsSubsequence_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsSubsequence_Test.java index 86b572cef2..c2b2b9f849 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsSubsequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_containsSubsequence_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.longarray; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicLongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_contains_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_contains_Test.java index 9dacc57cd4..6b3b9c970f 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_contains_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_contains_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.longarray; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicLongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_contains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_contains_at_Index_Test.java index efe223c5b1..e77974c512 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_contains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_contains_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.longarray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicLongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_doesNotContain_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_doesNotContain_Test.java index 209de366bf..d22bb7fbaa 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_doesNotContain_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_doesNotContain_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.longarray; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicLongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_doesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_doesNotContain_at_Index_Test.java index 6b81e308af..da088905b0 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_doesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_doesNotContain_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.longarray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicLongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_endsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_endsWith_Test.java index efe1499379..51c14b3f28 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_endsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_endsWith_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.longarray; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicLongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_hasArray_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_hasArray_Test.java index df5eadeebb..874d50608f 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_hasArray_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_hasArray_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.atomic.longarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import java.util.concurrent.atomic.AtomicLongArray; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_isSortedAccordingToComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_isSortedAccordingToComparator_Test.java index d69fb69827..3fd549588f 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_isSortedAccordingToComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_isSortedAccordingToComparator_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.longarray; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import static org.mockito.Mockito.verify; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_startsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_startsWith_Test.java index f7714f5f13..5c30ed401d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_startsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_startsWith_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.longarray; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicLongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_usingComparator_Test.java index 8667b9468f..fc3aa8c3e6 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.atomic.longarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; import java.util.concurrent.atomic.AtomicLongArray; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_usingDefaultComparator_Test.java index 460a276098..d81a67c547 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_usingDefaultComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.atomic.longarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.AtomicLongArrayAssert; import org.assertj.core.api.AtomicLongArrayAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_usingDefaultElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_usingDefaultElementComparator_Test.java index 7d7fc74427..a43d8b5cb8 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_usingDefaultElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_usingDefaultElementComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.atomic.longarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.AtomicLongArrayAssert; import org.assertj.core.api.AtomicLongArrayAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_usingElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_usingElementComparator_Test.java index 0d7a90543d..bea6ed41bf 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_usingElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/longarray/AtomicLongArrayAssert_usingElementComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.atomic.longarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; import java.util.concurrent.atomic.AtomicLongArray; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_contains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_contains_at_Index_Test.java index c1d81a5ed0..d8307e949c 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_contains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_contains_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.referencearray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicReferenceArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_doesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_doesNotContain_at_Index_Test.java index d899f0205f..ff4098e3fd 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_doesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_doesNotContain_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.referencearray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.AtomicReferenceArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_extractingResultOf_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_extractingResultOf_Test.java index 64d6943e61..8ba1664dc2 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_extractingResultOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_extractingResultOf_Test.java @@ -19,8 +19,8 @@ import java.util.concurrent.atomic.AtomicReferenceArray; -import org.assertj.core.test.FluentJedi; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.FluentJedi; +import org.assertj.core.testkit.Name; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_extracting_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_extracting_Test.java index 81a9d51b30..990db4fa11 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_extracting_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_extracting_Test.java @@ -22,8 +22,8 @@ import org.assertj.core.api.iterable.Extractor; import org.assertj.core.api.iterable.ThrowingExtractor; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.assertj.core.util.introspection.IntrospectionError; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_filteredOn_condition_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_filteredOn_condition_Test.java index e3b0aa0278..645fca507c 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_filteredOn_condition_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_filteredOn_condition_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.not; import org.assertj.core.api.Condition; -import org.assertj.core.test.Employee; +import org.assertj.core.testkit.Employee; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_filteredOn_function_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_filteredOn_function_Test.java index 722f64fdd2..77f39c0b57 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_filteredOn_function_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_filteredOn_function_Test.java @@ -15,15 +15,15 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; -import static org.assertj.core.test.Name.lastNameComparator; -import static org.assertj.core.test.Name.name; +import static org.assertj.core.testkit.Name.lastNameComparator; +import static org.assertj.core.testkit.Name.name; import static org.assertj.core.util.Lists.list; import java.util.function.Function; import org.assertj.core.api.IterableAssert; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_filteredOn_predicate_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_filteredOn_predicate_Test.java index 83ad3dc687..fe91cdbd7e 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_filteredOn_predicate_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_filteredOn_predicate_Test.java @@ -17,7 +17,7 @@ import java.util.function.Predicate; -import org.assertj.core.test.Employee; +import org.assertj.core.testkit.Employee; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_filtered_baseTest.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_filtered_baseTest.java index d73d2f86fc..f8bc6c5bb2 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_filtered_baseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_filtered_baseTest.java @@ -14,8 +14,8 @@ import java.util.concurrent.atomic.AtomicReferenceArray; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.junit.jupiter.api.BeforeEach; class AtomicReferenceArrayAssert_filtered_baseTest { diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_flatExtracting_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_flatExtracting_Test.java index 09be5f6fb5..def79341e7 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_flatExtracting_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_flatExtracting_Test.java @@ -23,7 +23,7 @@ import org.assertj.core.api.iterable.Extractor; import org.assertj.core.api.iterable.ThrowingExtractor; -import org.assertj.core.test.CartoonCharacter; +import org.assertj.core.testkit.CartoonCharacter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_flatExtracting_with_String_parameter_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_flatExtracting_with_String_parameter_Test.java index 86e07c8dd8..b62839dbc2 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_flatExtracting_with_String_parameter_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_flatExtracting_with_String_parameter_Test.java @@ -18,7 +18,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray; -import org.assertj.core.test.CartoonCharacter; +import org.assertj.core.testkit.CartoonCharacter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_isSortedAccordingToComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_isSortedAccordingToComparator_Test.java index a31422b6d3..db3d6aa851 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_isSortedAccordingToComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_isSortedAccordingToComparator_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.atomic.referencearray; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import static org.mockito.Mockito.verify; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingComparatorForType_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingComparatorForType_Test.java index e4007eb9f5..b52dec89fa 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingComparatorForType_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingComparatorForType_Test.java @@ -16,8 +16,8 @@ import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; -import static org.assertj.core.test.NeverEqualComparator.NEVER_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.NeverEqualComparator.NEVER_EQUALS_STRING; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.BigDecimalComparator.BIG_DECIMAL_COMPARATOR; @@ -30,7 +30,7 @@ import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.internal.ExtendedByTypesComparator; import org.assertj.core.internal.ObjectArrays; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -178,7 +178,7 @@ void should_fail_because_of_comparator_set_last() { + " [Luke the Jedi]%n" + "when comparing values using field/property by field/property comparator on all fields/properties%n" + "Comparators used:%n" - + "- for elements fields (by type): {Double -> DoubleComparator[precision=1.0E-15], Float -> FloatComparator[precision=1.0E-6], String -> org.assertj.core.test.NeverEqualComparator, Path -> lexicographic comparator (Path natural order)}%n" + + "- for elements fields (by type): {Double -> DoubleComparator[precision=1.0E-15], Float -> FloatComparator[precision=1.0E-6], String -> org.assertj.core.testkit.NeverEqualComparator, Path -> lexicographic comparator (Path natural order)}%n" + "- for elements (by type): {Double -> DoubleComparator[precision=1.0E-15], Float -> FloatComparator[precision=1.0E-6], String -> AlwaysEqualComparator, Path -> lexicographic comparator (Path natural order)}")); } } diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingComparator_Test.java index 79da06253a..24fc66b0d1 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.atomic.referencearray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; import java.util.concurrent.atomic.AtomicReferenceArray; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingDefaultComparator_Test.java index 8d684c8ff9..f6a8837c7e 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingDefaultComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.atomic.referencearray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.AtomicReferenceArrayAssert; import org.assertj.core.api.AtomicReferenceArrayAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingDefaultElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingDefaultElementComparator_Test.java index e7b7183015..fecf747a2e 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingDefaultElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingDefaultElementComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.atomic.referencearray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.AtomicReferenceArrayAssert; import org.assertj.core.api.AtomicReferenceArrayAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingElementComparatorIgnoringFields_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingElementComparatorIgnoringFields_Test.java index 7646120fb2..5484a90bfd 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingElementComparatorIgnoringFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingElementComparatorIgnoringFields_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.atomic.referencearray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; import java.util.Comparator; @@ -23,7 +23,7 @@ import org.assertj.core.internal.ExtendedByTypesComparator; import org.assertj.core.internal.IgnoringFieldsComparator; import org.assertj.core.internal.ObjectArrays; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingElementComparatorOnFields_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingElementComparatorOnFields_Test.java index c7b8e871e5..488f6ceda7 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingElementComparatorOnFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingElementComparatorOnFields_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.atomic.referencearray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; import java.util.Comparator; @@ -23,7 +23,7 @@ import org.assertj.core.internal.ExtendedByTypesComparator; import org.assertj.core.internal.ObjectArrays; import org.assertj.core.internal.OnFieldsComparator; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingElementComparator_Test.java index 72f0e1cabe..44daf427a8 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingElementComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.atomic.referencearray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingFieldByFieldElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingFieldByFieldElementComparator_Test.java index 55f1b4c3c2..2583c869cb 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingFieldByFieldElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingFieldByFieldElementComparator_Test.java @@ -15,8 +15,8 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.Lists.newArrayList; @@ -29,7 +29,7 @@ import org.assertj.core.internal.AtomicReferenceArrayElementComparisonStrategy; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.internal.ObjectArrays; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingRecursiveFieldByFieldElementComparatorIgnoringFields_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingRecursiveFieldByFieldElementComparatorIgnoringFields_Test.java index 97092ec2b9..34a18966f6 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingRecursiveFieldByFieldElementComparatorIgnoringFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingRecursiveFieldByFieldElementComparatorIgnoringFields_Test.java @@ -22,8 +22,8 @@ import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.internal.ConfigurableRecursiveFieldByFieldComparator; import org.assertj.core.internal.ObjectArrays; -import org.assertj.core.test.Name; -import org.assertj.core.test.Player; +import org.assertj.core.testkit.Name; +import org.assertj.core.testkit.Player; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingRecursiveFieldByFieldElementComparatorOnFields_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingRecursiveFieldByFieldElementComparatorOnFields_Test.java index bd8ef317a2..29db37152a 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingRecursiveFieldByFieldElementComparatorOnFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingRecursiveFieldByFieldElementComparatorOnFields_Test.java @@ -22,8 +22,8 @@ import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.internal.ConfigurableRecursiveFieldByFieldComparator; import org.assertj.core.internal.ObjectArrays; -import org.assertj.core.test.Name; -import org.assertj.core.test.Player; +import org.assertj.core.testkit.Name; +import org.assertj.core.testkit.Player; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingRecursiveFieldByFieldElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingRecursiveFieldByFieldElementComparator_Test.java index a4b87ca0a6..04fa51a933 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingRecursiveFieldByFieldElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/atomic/referencearray/AtomicReferenceArrayAssert_usingRecursiveFieldByFieldElementComparator_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.configuration.ConfigurationProvider.CONFIGURATION_PROVIDER; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import java.util.concurrent.atomic.AtomicReferenceArray; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bigdecimal/BigDecimalAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bigdecimal/BigDecimalAssert_usingComparator_Test.java index 02acae649e..50ada58fef 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bigdecimal/BigDecimalAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bigdecimal/BigDecimalAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.bigdecimal; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.math.BigDecimal; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bigdecimal/BigDecimalAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bigdecimal/BigDecimalAssert_usingDefaultComparator_Test.java index dd6a8ecbe8..ca78b19da9 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bigdecimal/BigDecimalAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bigdecimal/BigDecimalAssert_usingDefaultComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.bigdecimal; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.BigDecimalAssert; import org.assertj.core.api.BigDecimalAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/biginteger/BigIntegerAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/biginteger/BigIntegerAssert_usingComparator_Test.java index 9f7e11558f..75d6e6db23 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/biginteger/BigIntegerAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/biginteger/BigIntegerAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.biginteger; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.math.BigInteger; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/biginteger/BigIntegerAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/biginteger/BigIntegerAssert_usingDefaultComparator_Test.java index 026305aa28..46ad4d8e99 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/biginteger/BigIntegerAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/biginteger/BigIntegerAssert_usingDefaultComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.biginteger; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.BigIntegerAssert; import org.assertj.core.api.BigIntegerAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/boolean2darray/Boolean2DArrayAssert_contains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/boolean2darray/Boolean2DArrayAssert_contains_at_Index_Test.java index de0fdda4c6..8267f1f0d3 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/boolean2darray/Boolean2DArrayAssert_contains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/boolean2darray/Boolean2DArrayAssert_contains_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.boolean2darray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.Boolean2DArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/boolean2darray/Boolean2DArrayAssert_doesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/boolean2darray/Boolean2DArrayAssert_doesNotContain_at_Index_Test.java index 426a69f1fc..d4d92e4fae 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/boolean2darray/Boolean2DArrayAssert_doesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/boolean2darray/Boolean2DArrayAssert_doesNotContain_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.boolean2darray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.Boolean2DArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/boolean2darray/Boolean2DArrayAssert_usingCustomComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/boolean2darray/Boolean2DArrayAssert_usingCustomComparator_Test.java index fe67e65f1a..3f4d4f1b7f 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/boolean2darray/Boolean2DArrayAssert_usingCustomComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/boolean2darray/Boolean2DArrayAssert_usingCustomComparator_Test.java @@ -13,11 +13,11 @@ package org.assertj.core.api.boolean2darray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.Boolean2DArrayAssert; import org.assertj.core.api.Boolean2DArrayAssertBaseTest; -import org.assertj.core.test.AlwaysEqualComparator; +import org.assertj.core.testkit.AlwaysEqualComparator; import org.junit.jupiter.api.Test; class Boolean2DArrayAssert_usingCustomComparator_Test extends Boolean2DArrayAssertBaseTest { diff --git a/assertj-core/src/test/java/org/assertj/core/api/boolean_/BooleanAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/boolean_/BooleanAssert_usingComparator_Test.java index c7f20e22e1..1deb5d9323 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/boolean_/BooleanAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/boolean_/BooleanAssert_usingComparator_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsAnyOf_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsAnyOf_Test.java index ae2412e093..24c86d0733 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsAnyOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsAnyOf_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.booleanarray; -import static org.assertj.core.test.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.BooleanArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsAnyOf_with_Boolean_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsAnyOf_with_Boolean_array_Test.java index c16ac84bb1..90566ed254 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsAnyOf_with_Boolean_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsAnyOf_with_Boolean_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.BooleanArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsExactlyInAnyOrder_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsExactlyInAnyOrder_Test.java index f5386a0aab..3a032e2602 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsExactlyInAnyOrder_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsExactlyInAnyOrder_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.booleanarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.BooleanArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsExactlyInAnyOrder_with_Boolean_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsExactlyInAnyOrder_with_Boolean_array_Test.java index 9f2e0fab13..3f671e2b52 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsExactlyInAnyOrder_with_Boolean_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsExactlyInAnyOrder_with_Boolean_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.BooleanArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsExactly_Test.java index 390e26438d..15442edc31 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsExactly_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.booleanarray; -import static org.assertj.core.test.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.BooleanArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsExactly_with_Boolean_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsExactly_with_Boolean_array_Test.java index 0b41c2a7bc..7e811b8f56 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsExactly_with_Boolean_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsExactly_with_Boolean_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.BooleanArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsOnlyOnce_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsOnlyOnce_Test.java index cc2cc7836c..df2694ca74 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsOnlyOnce_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsOnlyOnce_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.booleanarray; -import static org.assertj.core.test.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.BooleanArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsOnlyOnce_with_Boolean_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsOnlyOnce_with_Boolean_array_Test.java index 3b90b3be3f..d61b34593f 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsOnlyOnce_with_Boolean_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsOnlyOnce_with_Boolean_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.BooleanArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsOnly_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsOnly_Test.java index c0e15d0797..a477000184 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsOnly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsOnly_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.booleanarray; -import static org.assertj.core.test.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.BooleanArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsOnly_with_Boolean_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsOnly_with_Boolean_array_Test.java index b3585b0b28..4d1a238e3d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsOnly_with_Boolean_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsOnly_with_Boolean_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.BooleanArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsSequence_Test.java index 6745fbe253..e214e6f242 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsSequence_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.booleanarray; -import static org.assertj.core.test.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.BooleanArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsSequence_with_Boolean_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsSequence_with_Boolean_array_Test.java index ffae7c3e13..d1e9099f3f 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsSequence_with_Boolean_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsSequence_with_Boolean_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.BooleanArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsSubsequence_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsSubsequence_Test.java index d65843df6f..d6c823945e 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsSubsequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsSubsequence_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.booleanarray; -import static org.assertj.core.test.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.BooleanArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsSubsequence_with_Boolean_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsSubsequence_with_Boolean_array_Test.java index 0375e9ff40..e18ae14ccb 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsSubsequence_with_Boolean_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_containsSubsequence_with_Boolean_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.BooleanArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_contains_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_contains_Test.java index 2c4c8dadea..50e435c2bf 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_contains_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_contains_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.booleanarray; -import static org.assertj.core.test.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.BooleanArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_contains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_contains_at_Index_Test.java index 2cf1a2ff77..fffcaf4a86 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_contains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_contains_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.booleanarray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.BooleanArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_contains_with_Boolean_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_contains_with_Boolean_array_Test.java index b529379f0e..d7d3e7cc5e 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_contains_with_Boolean_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_contains_with_Boolean_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.BooleanArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_doesNotContain_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_doesNotContain_Test.java index 5e0b860919..bcb28ae03f 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_doesNotContain_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_doesNotContain_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.booleanarray; -import static org.assertj.core.test.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.BooleanArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_doesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_doesNotContain_at_Index_Test.java index a87dc7c407..26f6931505 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_doesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_doesNotContain_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.booleanarray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.BooleanArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_doesNotContain_with_Boolean_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_doesNotContain_with_Boolean_array_Test.java index 5f7f9ba419..c82b13b624 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_doesNotContain_with_Boolean_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_doesNotContain_with_Boolean_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.BooleanArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_endsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_endsWith_Test.java index 444b73b90a..1a4ba14255 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_endsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_endsWith_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.booleanarray; -import static org.assertj.core.test.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.BooleanArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_endsWith_with_Boolean_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_endsWith_with_Boolean_array_Test.java index a974ba8c35..e07115d3a8 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_endsWith_with_Boolean_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_endsWith_with_Boolean_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.BooleanArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_isSortedAccordingToComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_isSortedAccordingToComparator_Test.java index bbb960aaf1..dc7ef8fa18 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_isSortedAccordingToComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_isSortedAccordingToComparator_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.booleanarray; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import static org.mockito.Mockito.verify; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_startsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_startsWith_Test.java index 21886f8f75..6d5a22bb1f 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_startsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_startsWith_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.booleanarray; -import static org.assertj.core.test.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.BooleanArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_startsWith_with_Boolean_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_startsWith_with_Boolean_array_Test.java index 66a1667b2b..68dcf7b4f7 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_startsWith_with_Boolean_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_startsWith_with_Boolean_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.BooleanArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_usingComparator_Test.java index 3f85847ee2..11d6894e53 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.booleanarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_usingDefaultComparator_Test.java index dd964f8baf..974c0cc6d1 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/booleanarray/BooleanArrayAssert_usingDefaultComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.booleanarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.BooleanArrayAssert; import org.assertj.core.api.BooleanArrayAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/byte2darray/Byte2DArrayAssert_contains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/byte2darray/Byte2DArrayAssert_contains_at_Index_Test.java index 86d7cd9e34..73257a6656 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/byte2darray/Byte2DArrayAssert_contains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/byte2darray/Byte2DArrayAssert_contains_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.byte2darray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.Byte2DArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/byte2darray/Byte2DArrayAssert_doesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/byte2darray/Byte2DArrayAssert_doesNotContain_at_Index_Test.java index 1d04046400..54063f83d5 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/byte2darray/Byte2DArrayAssert_doesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/byte2darray/Byte2DArrayAssert_doesNotContain_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.byte2darray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.Byte2DArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/byte2darray/Byte2DArrayAssert_usingCustomComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/byte2darray/Byte2DArrayAssert_usingCustomComparator_Test.java index 1753ad085e..d685b0bece 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/byte2darray/Byte2DArrayAssert_usingCustomComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/byte2darray/Byte2DArrayAssert_usingCustomComparator_Test.java @@ -13,11 +13,11 @@ package org.assertj.core.api.byte2darray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.Byte2DArrayAssert; import org.assertj.core.api.Byte2DArrayAssertBaseTest; -import org.assertj.core.test.AlwaysEqualComparator; +import org.assertj.core.testkit.AlwaysEqualComparator; import org.junit.jupiter.api.Test; class Byte2DArrayAssert_usingCustomComparator_Test extends Byte2DArrayAssertBaseTest { diff --git a/assertj-core/src/test/java/org/assertj/core/api/byte_/ByteAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/byte_/ByteAssert_usingComparator_Test.java index 607a0726fa..144c084d9c 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/byte_/ByteAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/byte_/ByteAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.byte_; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/byte_/ByteAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/byte_/ByteAssert_usingDefaultComparator_Test.java index 1af4f5b032..24052c20db 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/byte_/ByteAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/byte_/ByteAssert_usingDefaultComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.byte_; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.ByteAssert; import org.assertj.core.api.ByteAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_asHexString_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_asHexString_Test.java index 9af6cde1e1..c404406fc7 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_asHexString_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_asHexString_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assumptions.assumeThat; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.AssertionsUtil.expectAssumptionNotMetException; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_asString_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_asString_Test.java index 5cd2f891e4..70df0be132 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_asString_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_asString_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assumptions.assumeThat; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.AssertionsUtil.expectAssumptionNotMetException; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_asString_with_charset_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_asString_with_charset_Test.java index 2f8d2d35ee..09e486306a 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_asString_with_charset_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_asString_with_charset_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assumptions.assumeThat; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.AssertionsUtil.expectAssumptionNotMetException; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsAnyOf_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsAnyOf_Test.java index 4e28133dbd..73d76a620d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsAnyOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsAnyOf_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.bytearray; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsAnyOf_with_Byte_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsAnyOf_with_Byte_array_Test.java index 307075425f..dfe533bb33 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsAnyOf_with_Byte_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsAnyOf_with_Byte_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsAnyOf_with_int_argument_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsAnyOf_with_int_argument_Test.java index cc7570e204..2188a9cce0 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsAnyOf_with_int_argument_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsAnyOf_with_int_argument_Test.java @@ -12,13 +12,13 @@ */ package org.assertj.core.api.bytearray; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import org.assertj.core.api.ByteArrayAssert; import org.assertj.core.api.ByteArrayAssertBaseTest; -import org.assertj.core.test.IntArrays; +import org.assertj.core.testkit.IntArrays; class ByteArrayAssert_containsAnyOf_with_int_argument_Test extends ByteArrayAssertBaseTest { diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsExactlyInAnyOrder_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsExactlyInAnyOrder_Test.java index f6d6fd24e0..30840794a6 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsExactlyInAnyOrder_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsExactlyInAnyOrder_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.bytearray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsExactlyInAnyOrder_with_Byte_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsExactlyInAnyOrder_with_Byte_array_Test.java index 79a46b729b..38a636b854 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsExactlyInAnyOrder_with_Byte_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsExactlyInAnyOrder_with_Byte_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsExactlyInAnyOrder_with_integers_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsExactlyInAnyOrder_with_integers_Test.java index 8bbd2dbb8a..a1c60d521f 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsExactlyInAnyOrder_with_integers_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsExactlyInAnyOrder_with_integers_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.bytearray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsExactly_Test.java index 608e5a8bae..857f29a83d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsExactly_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.bytearray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsExactly_with_Byte_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsExactly_with_Byte_array_Test.java index ee34d9660b..a4649ecd30 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsExactly_with_Byte_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsExactly_with_Byte_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsExactly_with_Integer_Arguments_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsExactly_with_Integer_Arguments_Test.java index c3b8c84bce..b33d46f423 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsExactly_with_Integer_Arguments_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsExactly_with_Integer_Arguments_Test.java @@ -13,13 +13,13 @@ package org.assertj.core.api.bytearray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import org.assertj.core.api.ByteArrayAssert; import org.assertj.core.api.ByteArrayAssertBaseTest; -import org.assertj.core.test.IntArrays; +import org.assertj.core.testkit.IntArrays; import org.assertj.core.util.AbsValueComparator; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsOnlyOnce_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsOnlyOnce_Test.java index b83c6de02b..851ecba0da 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsOnlyOnce_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsOnlyOnce_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.bytearray; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsOnlyOnce_with_Byte_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsOnlyOnce_with_Byte_array_Test.java index 1683456f30..eb30f6928d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsOnlyOnce_with_Byte_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsOnlyOnce_with_Byte_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsOnlyOnce_with_Integer_Arguments_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsOnlyOnce_with_Integer_Arguments_Test.java index 9edb2b11ca..b51b947b33 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsOnlyOnce_with_Integer_Arguments_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsOnlyOnce_with_Integer_Arguments_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.bytearray; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsOnly_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsOnly_Test.java index 59ec66583b..428a485f61 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsOnly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsOnly_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.bytearray; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsOnly_with_Byte_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsOnly_with_Byte_array_Test.java index c5f97d9bfd..7018141552 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsOnly_with_Byte_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsOnly_with_Byte_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsOnly_with_Integer_Arguments_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsOnly_with_Integer_Arguments_Test.java index 3b4542d235..de9703a1bf 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsOnly_with_Integer_Arguments_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsOnly_with_Integer_Arguments_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.bytearray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsSequence_Test.java index 5382776334..c1af5ce5a9 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsSequence_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.bytearray; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsSequence_with_Byte_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsSequence_with_Byte_array_Test.java index ff38cecc90..95387c3125 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsSequence_with_Byte_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsSequence_with_Byte_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsSequence_with_Integer_Arguments_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsSequence_with_Integer_Arguments_Test.java index 73fca5aae1..faaf4108e3 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsSequence_with_Integer_Arguments_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsSequence_with_Integer_Arguments_Test.java @@ -17,7 +17,7 @@ import org.assertj.core.api.ByteArrayAssert; import org.assertj.core.api.ByteArrayAssertBaseTest; -import org.assertj.core.test.IntArrays; +import org.assertj.core.testkit.IntArrays; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsSubsequence_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsSubsequence_Test.java index f1d948fc73..f8ef3be418 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsSubsequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsSubsequence_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.bytearray; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsSubsequence_with_Byte_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsSubsequence_with_Byte_array_Test.java index d1d15e59af..34418477ad 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsSubsequence_with_Byte_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsSubsequence_with_Byte_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsSubsequence_with_Integer_Arguments_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsSubsequence_with_Integer_Arguments_Test.java index 41f668d1ad..4e5b9e48b3 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsSubsequence_with_Integer_Arguments_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_containsSubsequence_with_Integer_Arguments_Test.java @@ -17,7 +17,7 @@ import org.assertj.core.api.ByteArrayAssert; import org.assertj.core.api.ByteArrayAssertBaseTest; -import org.assertj.core.test.IntArrays; +import org.assertj.core.testkit.IntArrays; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_contains_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_contains_Test.java index 4fbb44bdcb..58f30d63ed 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_contains_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_contains_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.bytearray; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_contains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_contains_at_Index_Test.java index fcf895fb7c..05abb1f2ca 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_contains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_contains_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.bytearray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_contains_at_Index_with_Integer_Argument_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_contains_at_Index_with_Integer_Argument_Test.java index f45b2d24d0..06e4b3b9ca 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_contains_at_Index_with_Integer_Argument_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_contains_at_Index_with_Integer_Argument_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.data.Index.atIndex; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_contains_with_Byte_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_contains_with_Byte_array_Test.java index 075c1dd07b..a5044714f4 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_contains_with_Byte_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_contains_with_Byte_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_contains_with_Integer_Arguments_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_contains_with_Integer_Arguments_Test.java index 29962635f2..2503880117 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_contains_with_Integer_Arguments_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_contains_with_Integer_Arguments_Test.java @@ -17,7 +17,7 @@ import org.assertj.core.api.ByteArrayAssert; import org.assertj.core.api.ByteArrayAssertBaseTest; -import org.assertj.core.test.IntArrays; +import org.assertj.core.testkit.IntArrays; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_doesNotContain_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_doesNotContain_Test.java index 7d5449b754..55f5c0af1d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_doesNotContain_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_doesNotContain_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.bytearray; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_doesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_doesNotContain_at_Index_Test.java index abdf6f4ea8..6c9deed3e9 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_doesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_doesNotContain_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.bytearray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_doesNotContain_at_Index_with_Integer_Argument_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_doesNotContain_at_Index_with_Integer_Argument_Test.java index 9777b75328..aaace2c5c7 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_doesNotContain_at_Index_with_Integer_Argument_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_doesNotContain_at_Index_with_Integer_Argument_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.data.Index.atIndex; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_doesNotContain_with_Byte_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_doesNotContain_with_Byte_array_Test.java index 4c11628bf2..e8668dbf44 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_doesNotContain_with_Byte_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_doesNotContain_with_Byte_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_doesNotContain_with_Integer_Arguments_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_doesNotContain_with_Integer_Arguments_Test.java index 9c8af3e85f..345b782bdc 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_doesNotContain_with_Integer_Arguments_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_doesNotContain_with_Integer_Arguments_Test.java @@ -17,7 +17,7 @@ import org.assertj.core.api.ByteArrayAssert; import org.assertj.core.api.ByteArrayAssertBaseTest; -import org.assertj.core.test.IntArrays; +import org.assertj.core.testkit.IntArrays; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_endsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_endsWith_Test.java index ea73d0884b..1b4ebc39ff 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_endsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_endsWith_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.bytearray; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_endsWith_with_Byte_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_endsWith_with_Byte_array_Test.java index f962ada9a7..d560dd8565 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_endsWith_with_Byte_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_endsWith_with_Byte_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_endsWith_with_Integer_Arguments_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_endsWith_with_Integer_Arguments_Test.java index 5b13e9eb7b..80ba8602f9 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_endsWith_with_Integer_Arguments_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_endsWith_with_Integer_Arguments_Test.java @@ -17,7 +17,7 @@ import org.assertj.core.api.ByteArrayAssert; import org.assertj.core.api.ByteArrayAssertBaseTest; -import org.assertj.core.test.IntArrays; +import org.assertj.core.testkit.IntArrays; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_isSortedAccordingToComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_isSortedAccordingToComparator_Test.java index 419fea7b21..67492942a1 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_isSortedAccordingToComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_isSortedAccordingToComparator_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.bytearray; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import static org.mockito.Mockito.verify; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_startsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_startsWith_Test.java index 36180c0de5..5f8c6c2867 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_startsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_startsWith_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.bytearray; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_startsWith_with_Byte_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_startsWith_with_Byte_array_Test.java index 216860995b..eb7a39f720 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_startsWith_with_Byte_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_startsWith_with_Byte_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ByteArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_startsWith_with_Integer_Arguments_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_startsWith_with_Integer_Arguments_Test.java index 8812e03c20..6a820e3298 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_startsWith_with_Integer_Arguments_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_startsWith_with_Integer_Arguments_Test.java @@ -17,7 +17,7 @@ import org.assertj.core.api.ByteArrayAssert; import org.assertj.core.api.ByteArrayAssertBaseTest; -import org.assertj.core.test.IntArrays; +import org.assertj.core.testkit.IntArrays; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_usingComparator_Test.java index 1136e88f03..876453a914 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.bytearray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_usingDefaultComparator_Test.java index 25f3d7fac2..c3b7280a24 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_usingDefaultComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.bytearray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.ByteArrayAssert; import org.assertj.core.api.ByteArrayAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_usingDefaultElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_usingDefaultElementComparator_Test.java index 014f734f83..a933b5baed 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_usingDefaultElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_usingDefaultElementComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.bytearray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.ByteArrayAssert; import org.assertj.core.api.ByteArrayAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_usingElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_usingElementComparator_Test.java index 6460026687..05842bd029 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_usingElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/bytearray/ByteArrayAssert_usingElementComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.bytearray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/char2darray/Char2DArrayAssert_contains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/char2darray/Char2DArrayAssert_contains_at_Index_Test.java index 81553b2905..e51f925792 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/char2darray/Char2DArrayAssert_contains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/char2darray/Char2DArrayAssert_contains_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.char2darray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.Char2DArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/char2darray/Char2DArrayAssert_doesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/char2darray/Char2DArrayAssert_doesNotContain_at_Index_Test.java index 664c8e9190..cbd2ea8930 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/char2darray/Char2DArrayAssert_doesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/char2darray/Char2DArrayAssert_doesNotContain_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.char2darray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.Char2DArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/char2darray/Char2DArrayAssert_usingCustomComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/char2darray/Char2DArrayAssert_usingCustomComparator_Test.java index 165c32eea4..78880680df 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/char2darray/Char2DArrayAssert_usingCustomComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/char2darray/Char2DArrayAssert_usingCustomComparator_Test.java @@ -13,11 +13,11 @@ package org.assertj.core.api.char2darray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.Char2DArrayAssert; import org.assertj.core.api.Char2DArrayAssertBaseTest; -import org.assertj.core.test.AlwaysEqualComparator; +import org.assertj.core.testkit.AlwaysEqualComparator; import org.junit.jupiter.api.Test; class Char2DArrayAssert_usingCustomComparator_Test extends Char2DArrayAssertBaseTest { diff --git a/assertj-core/src/test/java/org/assertj/core/api/character/CharacterAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/character/CharacterAssert_usingComparator_Test.java index c4a777955e..83a5a06e74 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/character/CharacterAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/character/CharacterAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.character; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/character/CharacterAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/character/CharacterAssert_usingDefaultComparator_Test.java index 020f31853f..e076391eef 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/character/CharacterAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/character/CharacterAssert_usingDefaultComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.character; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.CharacterAssert; import org.assertj.core.api.CharacterAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsAnyOf_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsAnyOf_Test.java index ad766a6603..885e1d98f1 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsAnyOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsAnyOf_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.chararray; -import static org.assertj.core.test.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsAnyOf_with_Character_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsAnyOf_with_Character_array_Test.java index d91791c861..e4e95dd3f2 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsAnyOf_with_Character_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsAnyOf_with_Character_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsExactlyInAnyOrder_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsExactlyInAnyOrder_Test.java index ca18fdab11..976ce5741d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsExactlyInAnyOrder_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsExactlyInAnyOrder_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.chararray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsExactlyInAnyOrder_with_Character_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsExactlyInAnyOrder_with_Character_array_Test.java index f1ac72d5a8..3e6231039a 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsExactlyInAnyOrder_with_Character_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsExactlyInAnyOrder_with_Character_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsExactly_Test.java index 59c4816bc5..c43d6953e2 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsExactly_Test.java @@ -13,12 +13,12 @@ package org.assertj.core.api.chararray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharArrayAssert; import org.assertj.core.api.CharArrayAssertBaseTest; -import org.assertj.core.test.CaseInsensitiveCharacterComparator; +import org.assertj.core.testkit.CaseInsensitiveCharacterComparator; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsExactly_with_Character_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsExactly_with_Character_array_Test.java index b618913ffc..ac669c9405 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsExactly_with_Character_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsExactly_with_Character_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsOnlyOnce_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsOnlyOnce_Test.java index 63d1df65cc..0f6914d3d3 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsOnlyOnce_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsOnlyOnce_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.chararray; -import static org.assertj.core.test.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsOnlyOnce_with_Character_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsOnlyOnce_with_Character_array_Test.java index 9ea7f75a75..f3ff9521ab 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsOnlyOnce_with_Character_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsOnlyOnce_with_Character_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsOnly_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsOnly_Test.java index 52de54f648..2abe67fc49 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsOnly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsOnly_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.chararray; -import static org.assertj.core.test.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsOnly_with_Character_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsOnly_with_Character_array_Test.java index 2ec201947a..3194831ae6 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsOnly_with_Character_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsOnly_with_Character_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsSequence_Test.java index efb86a20fc..5142957630 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsSequence_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.chararray; -import static org.assertj.core.test.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsSequence_with_Character_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsSequence_with_Character_array_Test.java index 92258d7156..8267c499b3 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsSequence_with_Character_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsSequence_with_Character_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsSubsequence_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsSubsequence_Test.java index b90140b7ae..7666c92b1d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsSubsequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsSubsequence_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.chararray; -import static org.assertj.core.test.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsSubsequence_with_Character_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsSubsequence_with_Character_array_Test.java index e2f70001e9..3742caf0d4 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsSubsequence_with_Character_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_containsSubsequence_with_Character_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_contains_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_contains_Test.java index 60302716ba..015523b2b6 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_contains_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_contains_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.chararray; -import static org.assertj.core.test.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_contains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_contains_at_Index_Test.java index 44655bd49e..b168767986 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_contains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_contains_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.chararray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_contains_with_Character_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_contains_with_Character_array_Test.java index cb71986597..50aac1b889 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_contains_with_Character_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_contains_with_Character_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_doesNotContain_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_doesNotContain_Test.java index 3430e0ae48..bdceefaf23 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_doesNotContain_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_doesNotContain_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.chararray; -import static org.assertj.core.test.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_doesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_doesNotContain_at_Index_Test.java index ca8d49afca..ac826a057c 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_doesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_doesNotContain_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.chararray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_doesNotContain_with_Character_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_doesNotContain_with_Character_array_Test.java index 307679fae0..bc25cb8e5f 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_doesNotContain_with_Character_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_doesNotContain_with_Character_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_endsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_endsWith_Test.java index e80f0787e9..c59b381bdf 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_endsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_endsWith_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.chararray; -import static org.assertj.core.test.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_endsWith_with_Character_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_endsWith_with_Character_array_Test.java index d49f0ce318..a1259b1804 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_endsWith_with_Character_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_endsWith_with_Character_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_isSortedAccordingToComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_isSortedAccordingToComparator_Test.java index 7432ee9054..7f981f5853 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_isSortedAccordingToComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_isSortedAccordingToComparator_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.chararray; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import static org.mockito.Mockito.verify; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_startsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_startsWith_Test.java index 882bf1a58e..eb3e265269 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_startsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_startsWith_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.chararray; -import static org.assertj.core.test.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_startsWith_with_Character_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_startsWith_with_Character_array_Test.java index f17646ac1f..1c188c5676 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_startsWith_with_Character_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_startsWith_with_Character_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_usingComparator_Test.java index f1865a9849..3e9608f751 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.chararray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_usingDefaultComparator_Test.java index a1459b0799..5364dea04c 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_usingDefaultComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.chararray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.CharArrayAssert; import org.assertj.core.api.CharArrayAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_usingDefaultElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_usingDefaultElementComparator_Test.java index d673bb7272..259fa60b8d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_usingDefaultElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_usingDefaultElementComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.chararray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.CharArrayAssert; import org.assertj.core.api.CharArrayAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_usingElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_usingElementComparator_Test.java index 3f6c227ff0..f18775572d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_usingElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/chararray/CharArrayAssert_usingElementComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.chararray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_containsIgnoringWhitespaces_Test.java b/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_containsIgnoringWhitespaces_Test.java index 68858c6ce0..d332058e94 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_containsIgnoringWhitespaces_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_containsIgnoringWhitespaces_Test.java @@ -27,7 +27,7 @@ import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.internal.StandardComparisonStrategy; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_containsPattern_Pattern_Test.java b/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_containsPattern_Pattern_Test.java index ec9744f116..3257bb0f9d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_containsPattern_Pattern_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_containsPattern_Pattern_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.charsequence; -import static org.assertj.core.test.TestData.matchAnything; +import static org.assertj.core.testkit.TestData.matchAnything; import static org.mockito.Mockito.verify; import java.util.regex.Pattern; diff --git a/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_containsPattern_String_Test.java b/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_containsPattern_String_Test.java index 0b3e5be540..9b0808d3bc 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_containsPattern_String_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_containsPattern_String_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.charsequence; -import static org.assertj.core.test.TestData.matchAnything; +import static org.assertj.core.testkit.TestData.matchAnything; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharSequenceAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_doesNotContainPattern_Pattern_Test.java b/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_doesNotContainPattern_Pattern_Test.java index c1613dfec1..0057257965 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_doesNotContainPattern_Pattern_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_doesNotContainPattern_Pattern_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.charsequence; -import static org.assertj.core.test.TestData.matchAnything; +import static org.assertj.core.testkit.TestData.matchAnything; import static org.mockito.Mockito.verify; import java.util.regex.Pattern; diff --git a/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_doesNotContainPattern_String_Test.java b/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_doesNotContainPattern_String_Test.java index dd21e0fd5e..bdc8ae6c2a 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_doesNotContainPattern_String_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_doesNotContainPattern_String_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.charsequence; -import static org.assertj.core.test.TestData.matchAnything; +import static org.assertj.core.testkit.TestData.matchAnything; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharSequenceAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_doesNotMatch_CharSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_doesNotMatch_CharSequence_Test.java index bc0b35357b..131c5fb5df 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_doesNotMatch_CharSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_doesNotMatch_CharSequence_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.charsequence; -import static org.assertj.core.test.TestData.matchAnything; +import static org.assertj.core.testkit.TestData.matchAnything; import static org.mockito.Mockito.verify; import java.util.regex.Pattern; diff --git a/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_doesNotMatch_Pattern_Test.java b/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_doesNotMatch_Pattern_Test.java index b773e375e5..06d8e533db 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_doesNotMatch_Pattern_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_doesNotMatch_Pattern_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.charsequence; -import static org.assertj.core.test.TestData.matchAnything; +import static org.assertj.core.testkit.TestData.matchAnything; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharSequenceAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_matches_Pattern_Test.java b/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_matches_Pattern_Test.java index 3d15e23324..6ae3f80a63 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_matches_Pattern_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_matches_Pattern_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.charsequence; -import static org.assertj.core.test.TestData.matchAnything; +import static org.assertj.core.testkit.TestData.matchAnything; import static org.mockito.Mockito.verify; import java.util.regex.Pattern; diff --git a/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_matches_String_Test.java b/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_matches_String_Test.java index 7af8b82c7b..4ca5f7e01e 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_matches_String_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_matches_String_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.charsequence; -import static org.assertj.core.test.TestData.matchAnything; +import static org.assertj.core.testkit.TestData.matchAnything; import static org.mockito.Mockito.verify; import org.assertj.core.api.CharSequenceAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_usingCustomComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_usingCustomComparator_Test.java index 56f4571ad1..4d4d8302d1 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_usingCustomComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_usingCustomComparator_Test.java @@ -18,7 +18,7 @@ import org.assertj.core.api.CharSequenceAssert; import org.assertj.core.api.CharSequenceAssertBaseTest; -import org.assertj.core.test.CaseInsensitiveCharSequenceComparator; +import org.assertj.core.testkit.CaseInsensitiveCharSequenceComparator; /** * Tests for {@link CharSequenceAssert#usingComparator(Comparator)}. diff --git a/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_usingDefaultComparator_Test.java index a46f54da2b..9010c6c6a3 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/charsequence/CharSequenceAssert_usingDefaultComparator_Test.java @@ -18,7 +18,7 @@ import org.assertj.core.api.CharSequenceAssertBaseTest; import org.assertj.core.internal.Objects; import org.assertj.core.internal.Strings; -import org.assertj.core.test.CaseInsensitiveCharSequenceComparator; +import org.assertj.core.testkit.CaseInsensitiveCharSequenceComparator; /** * Tests for {@link CharSequenceAssert#usingDefaultComparator()}. diff --git a/assertj-core/src/test/java/org/assertj/core/api/collection/CollectionAssert_isUnmodifiable_Test.java b/assertj-core/src/test/java/org/assertj/core/api/collection/CollectionAssert_isUnmodifiable_Test.java index 9d1a56b21d..4697ff6140 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/collection/CollectionAssert_isUnmodifiable_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/collection/CollectionAssert_isUnmodifiable_Test.java @@ -39,7 +39,7 @@ import org.apache.commons.collections4.set.UnmodifiableSet; import org.apache.commons.collections4.set.UnmodifiableSortedSet; import org.assertj.core.error.ErrorMessageFactory; -import org.assertj.core.test.jdk11.Jdk11; +import org.assertj.core.testkit.jdk11.Jdk11; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/assertj-core/src/test/java/org/assertj/core/api/comparable/AbstractComparableAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/comparable/AbstractComparableAssert_usingComparator_Test.java index 5bcc2d2c84..4a94c7bd31 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/comparable/AbstractComparableAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/comparable/AbstractComparableAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.comparable; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/comparable/AbstractComparableAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/comparable/AbstractComparableAssert_usingDefaultComparator_Test.java index 8f008afe9b..d447629baa 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/comparable/AbstractComparableAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/comparable/AbstractComparableAssert_usingDefaultComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.comparable; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.AbstractComparableAssert; import org.assertj.core.api.AbstractComparableAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/comparable/AbstractUniversalComparableAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/comparable/AbstractUniversalComparableAssert_usingComparator_Test.java index 3efc36c87c..84e2e19424 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/comparable/AbstractUniversalComparableAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/comparable/AbstractUniversalComparableAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.comparable; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/comparable/AbstractUniversalComparableAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/comparable/AbstractUniversalComparableAssert_usingDefaultComparator_Test.java index a89256ad8a..db7d4f42bf 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/comparable/AbstractUniversalComparableAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/comparable/AbstractUniversalComparableAssert_usingDefaultComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.comparable; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.AbstractUniversalComparableAssertBaseTest; import org.assertj.core.api.UniversalComparableAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/date/DateAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/date/DateAssert_usingComparator_Test.java index e35bf197ae..119113a4bc 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/date/DateAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/date/DateAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.date; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; import java.util.Date; diff --git a/assertj-core/src/test/java/org/assertj/core/api/double2darray/Double2DArrayAssert_contains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/double2darray/Double2DArrayAssert_contains_at_Index_Test.java index bb897b9713..fddb4b5b73 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/double2darray/Double2DArrayAssert_contains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/double2darray/Double2DArrayAssert_contains_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.double2darray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.Double2DArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/double2darray/Double2DArrayAssert_doesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/double2darray/Double2DArrayAssert_doesNotContain_at_Index_Test.java index 88e43f0802..d98acf39a8 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/double2darray/Double2DArrayAssert_doesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/double2darray/Double2DArrayAssert_doesNotContain_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.double2darray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.Double2DArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/double2darray/Double2DArrayAssert_usingCustomComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/double2darray/Double2DArrayAssert_usingCustomComparator_Test.java index 3a725fb64e..ff7803e8ac 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/double2darray/Double2DArrayAssert_usingCustomComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/double2darray/Double2DArrayAssert_usingCustomComparator_Test.java @@ -13,11 +13,11 @@ package org.assertj.core.api.double2darray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.Double2DArrayAssert; import org.assertj.core.api.Double2DArrayAssertBaseTest; -import org.assertj.core.test.AlwaysEqualComparator; +import org.assertj.core.testkit.AlwaysEqualComparator; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/double_/DoubleAssert_isEqualTo_double_Test.java b/assertj-core/src/test/java/org/assertj/core/api/double_/DoubleAssert_isEqualTo_double_Test.java index f46faf06d7..3b41e05567 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/double_/DoubleAssert_isEqualTo_double_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/double_/DoubleAssert_isEqualTo_double_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/api/double_/DoubleAssert_isNotEqualTo_double_primitive_Test.java b/assertj-core/src/test/java/org/assertj/core/api/double_/DoubleAssert_isNotEqualTo_double_primitive_Test.java index f4bd64fbbe..03a2eda01a 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/double_/DoubleAssert_isNotEqualTo_double_primitive_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/double_/DoubleAssert_isNotEqualTo_double_primitive_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.AlwaysDifferentComparator.ALWAY_DIFFERENT; +import static org.assertj.core.testkit.AlwaysDifferentComparator.ALWAY_DIFFERENT; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/api/double_/DoubleAssert_isZero_Test.java b/assertj-core/src/test/java/org/assertj/core/api/double_/DoubleAssert_isZero_Test.java index 0a63391e77..50253a4155 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/double_/DoubleAssert_isZero_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/double_/DoubleAssert_isZero_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/double_/DoubleAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/double_/DoubleAssert_usingComparator_Test.java index dbac23811f..38583af3a6 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/double_/DoubleAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/double_/DoubleAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.double_; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/double_/DoubleAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/double_/DoubleAssert_usingDefaultComparator_Test.java index f6f7abce4b..bcdf63d178 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/double_/DoubleAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/double_/DoubleAssert_usingDefaultComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.double_; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.DoubleAssert; import org.assertj.core.api.DoubleAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsAnyOf_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsAnyOf_Test.java index 42c6b280f8..5253a542cc 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsAnyOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsAnyOf_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.doublearray; -import static org.assertj.core.test.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsAnyOf_with_Double_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsAnyOf_with_Double_array_Test.java index f6ac5da1d5..42f0f36b40 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsAnyOf_with_Double_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsAnyOf_with_Double_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsExactlyInAnyOrder_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsExactlyInAnyOrder_Test.java index 48cdb6b9a1..485f2e1219 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsExactlyInAnyOrder_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsExactlyInAnyOrder_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.doublearray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsExactlyInAnyOrder_with_Double_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsExactlyInAnyOrder_with_Double_array_Test.java index 04a3822692..d959089f0e 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsExactlyInAnyOrder_with_Double_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsExactlyInAnyOrder_with_Double_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsExactly_Test.java index 8ce331bf95..c06dcdd911 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsExactly_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.withPrecision; import static org.assertj.core.api.Assertions.within; -import static org.assertj.core.test.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsExactly_with_Double_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsExactly_with_Double_array_Test.java index 15ae9f9861..ca9f537c07 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsExactly_with_Double_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsExactly_with_Double_array_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.withPrecision; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsOnlyOnce_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsOnlyOnce_Test.java index 76ff7d940a..8fda0a734c 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsOnlyOnce_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsOnlyOnce_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.withPrecision; -import static org.assertj.core.test.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsOnlyOnce_with_Double_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsOnlyOnce_with_Double_array_Test.java index 6c76e42670..69beb2cc0c 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsOnlyOnce_with_Double_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsOnlyOnce_with_Double_array_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.withPrecision; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsOnly_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsOnly_Test.java index 072649e21e..6514896256 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsOnly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsOnly_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.withPrecision; import static org.assertj.core.api.Assertions.within; -import static org.assertj.core.test.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsOnly_with_Double_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsOnly_with_Double_array_Test.java index 77f3ef3030..4826a2b7e3 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsOnly_with_Double_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsOnly_with_Double_array_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.withPrecision; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsSequence_Test.java index a9e36a3b9f..4ad0ed8c70 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsSequence_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.withPrecision; -import static org.assertj.core.test.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsSequence_with_Double_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsSequence_with_Double_array_Test.java index 06ed01fb79..c0b8de4418 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsSequence_with_Double_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsSequence_with_Double_array_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.withPrecision; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsSubsequence_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsSubsequence_Test.java index c8ac3d81d4..442a090d76 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsSubsequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsSubsequence_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.withPrecision; -import static org.assertj.core.test.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsSubsequence_with_Double_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsSubsequence_with_Double_array_Test.java index ae7ab95714..235abc4fca 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsSubsequence_with_Double_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_containsSubsequence_with_Double_array_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.withPrecision; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_contains_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_contains_Test.java index cc5964951d..767895fd66 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_contains_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_contains_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.withPrecision; -import static org.assertj.core.test.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_contains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_contains_at_Index_Test.java index fc8da33847..e56a722d89 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_contains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_contains_at_Index_Test.java @@ -15,8 +15,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.atIndex; import static org.assertj.core.api.Assertions.withPrecision; -import static org.assertj.core.test.DoubleArrays.arrayOf; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_contains_with_Double_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_contains_with_Double_array_Test.java index 612fc55667..eb71aa93a3 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_contains_with_Double_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_contains_with_Double_array_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.withPrecision; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_doesNotContain_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_doesNotContain_Test.java index 1b0ec0ff16..7d6e91a180 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_doesNotContain_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_doesNotContain_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.withPrecision; -import static org.assertj.core.test.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_doesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_doesNotContain_at_Index_Test.java index 786d049721..cf9805d670 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_doesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_doesNotContain_at_Index_Test.java @@ -15,8 +15,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.atIndex; import static org.assertj.core.api.Assertions.withPrecision; -import static org.assertj.core.test.DoubleArrays.arrayOf; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_doesNotContain_with_Double_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_doesNotContain_with_Double_array_Test.java index 39bc78d132..cc228387cf 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_doesNotContain_with_Double_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_doesNotContain_with_Double_array_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.withPrecision; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_doesNotHaveDuplicates_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_doesNotHaveDuplicates_Test.java index de9d516027..8dbe78cb67 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_doesNotHaveDuplicates_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_doesNotHaveDuplicates_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.withPrecision; -import static org.assertj.core.test.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_endsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_endsWith_Test.java index 5ff8c4b444..9d17a50624 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_endsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_endsWith_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.withPrecision; -import static org.assertj.core.test.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_endsWith_with_Double_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_endsWith_with_Double_array_Test.java index 98beefe46d..2d70e93cee 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_endsWith_with_Double_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_endsWith_with_Double_array_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.withPrecision; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_isSortedAccordingToComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_isSortedAccordingToComparator_Test.java index 5ba7622623..d18ae05056 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_isSortedAccordingToComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_isSortedAccordingToComparator_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.doublearray; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import static org.mockito.Mockito.verify; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_startsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_startsWith_Test.java index d9dec7ca57..ef67e92e94 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_startsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_startsWith_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.withPrecision; -import static org.assertj.core.test.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_startsWith_with_Double_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_startsWith_with_Double_array_Test.java index 0b052ad185..e381003a4f 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_startsWith_with_Double_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_startsWith_with_Double_array_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.withPrecision; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.DoubleArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_usingComparator_Test.java index c916cf97fa..0209691625 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.doublearray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_usingDefaultComparator_Test.java index 995657879f..986bb1cc72 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_usingDefaultComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.doublearray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.DoubleArrayAssert; import org.assertj.core.api.DoubleArrayAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_usingDefaultElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_usingDefaultElementComparator_Test.java index 62a422273c..06926b5042 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_usingDefaultElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_usingDefaultElementComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.doublearray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.DoubleArrayAssert; import org.assertj.core.api.DoubleArrayAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_usingElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_usingElementComparator_Test.java index febbd92a44..1dcc71ef67 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_usingElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/doublearray/DoubleArrayAssert_usingElementComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.doublearray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/filter/AbstractTest_equals_filter.java b/assertj-core/src/test/java/org/assertj/core/api/filter/AbstractTest_equals_filter.java index 9e33571cef..40b3eab721 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/filter/AbstractTest_equals_filter.java +++ b/assertj-core/src/test/java/org/assertj/core/api/filter/AbstractTest_equals_filter.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.setAllowExtractingPrivateFields; import static org.assertj.core.api.filter.Filters.filter; -import org.assertj.core.test.Player; -import org.assertj.core.test.WithPlayerData; +import org.assertj.core.testkit.Player; +import org.assertj.core.testkit.WithPlayerData; import org.assertj.core.util.introspection.IntrospectionError; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_being_condition_Test.java b/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_being_condition_Test.java index 28b85782de..713cac1e95 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_being_condition_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_being_condition_Test.java @@ -16,9 +16,9 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.filter.Filters.filter; -import org.assertj.core.test.Player; -import org.assertj.core.test.PotentialMvpCondition; -import org.assertj.core.test.WithPlayerData; +import org.assertj.core.testkit.Player; +import org.assertj.core.testkit.PotentialMvpCondition; +import org.assertj.core.testkit.WithPlayerData; import org.junit.jupiter.api.Test; class Filter_being_condition_Test extends WithPlayerData { diff --git a/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_create_Test.java b/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_create_Test.java index f25a26682e..770d1b853b 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_create_Test.java @@ -18,8 +18,8 @@ import java.util.List; -import org.assertj.core.test.Player; -import org.assertj.core.test.WithPlayerData; +import org.assertj.core.testkit.Player; +import org.assertj.core.testkit.WithPlayerData; import org.junit.jupiter.api.Test; class Filter_create_Test extends WithPlayerData { diff --git a/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_having_condition_Test.java b/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_having_condition_Test.java index b5ec901327..bf0646fd42 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_having_condition_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_having_condition_Test.java @@ -16,9 +16,9 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.filter.Filters.filter; -import org.assertj.core.test.Player; -import org.assertj.core.test.PotentialMvpCondition; -import org.assertj.core.test.WithPlayerData; +import org.assertj.core.testkit.Player; +import org.assertj.core.testkit.PotentialMvpCondition; +import org.assertj.core.testkit.WithPlayerData; import org.junit.jupiter.api.Test; class Filter_having_condition_Test extends WithPlayerData { diff --git a/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_on_different_properties_Test.java b/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_on_different_properties_Test.java index fd1859d23b..d1a9b8a020 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_on_different_properties_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_on_different_properties_Test.java @@ -16,8 +16,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.filter.Filters.filter; -import org.assertj.core.test.Player; -import org.assertj.core.test.WithPlayerData; +import org.assertj.core.testkit.Player; +import org.assertj.core.testkit.WithPlayerData; import org.assertj.core.util.introspection.IntrospectionError; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_common_Test.java b/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_common_Test.java index 1008fa4cf6..090cbb1b90 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_common_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_common_Test.java @@ -19,8 +19,8 @@ import java.util.List; -import org.assertj.core.test.Player; -import org.assertj.core.test.WithPlayerData; +import org.assertj.core.testkit.Player; +import org.assertj.core.testkit.WithPlayerData; import org.junit.jupiter.api.Test; class Filter_with_common_Test extends WithPlayerData { diff --git a/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_property_equals_to_given_value_Test.java b/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_property_equals_to_given_value_Test.java index 4a5cc21916..5f231b2b72 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_property_equals_to_given_value_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_property_equals_to_given_value_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.filter.Filters.filter; -import org.assertj.core.test.Player; +import org.assertj.core.testkit.Player; class Filter_with_property_equals_to_given_value_Test extends AbstractTest_equals_filter { diff --git a/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_property_equals_to_given_value_short_version_Test.java b/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_property_equals_to_given_value_short_version_Test.java index 0358622fb6..f52002b2f6 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_property_equals_to_given_value_short_version_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_property_equals_to_given_value_short_version_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.filter.Filters.filter; -import org.assertj.core.test.Player; +import org.assertj.core.testkit.Player; class Filter_with_property_equals_to_given_value_short_version_Test extends AbstractTest_equals_filter { diff --git a/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_property_equals_to_null_value_Test.java b/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_property_equals_to_null_value_Test.java index 1fcc955a5c..29d48dc29a 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_property_equals_to_null_value_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_property_equals_to_null_value_Test.java @@ -15,8 +15,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.filter.Filters.filter; -import org.assertj.core.test.Player; -import org.assertj.core.test.WithPlayerData; +import org.assertj.core.testkit.Player; +import org.assertj.core.testkit.WithPlayerData; import org.junit.jupiter.api.Test; class Filter_with_property_equals_to_null_value_Test extends WithPlayerData { diff --git a/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_property_in_given_values_Test.java b/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_property_in_given_values_Test.java index 0ce8d83276..e58382ec79 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_property_in_given_values_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_property_in_given_values_Test.java @@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.filter.Filters.filter; -import org.assertj.core.test.Player; -import org.assertj.core.test.WithPlayerData; +import org.assertj.core.testkit.Player; +import org.assertj.core.testkit.WithPlayerData; import org.assertj.core.util.introspection.IntrospectionError; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_property_not_equals_to_given_value_Test.java b/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_property_not_equals_to_given_value_Test.java index ca82f7a257..f4e6b2ee41 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_property_not_equals_to_given_value_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_property_not_equals_to_given_value_Test.java @@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.filter.Filters.filter; -import org.assertj.core.test.Player; -import org.assertj.core.test.WithPlayerData; +import org.assertj.core.testkit.Player; +import org.assertj.core.testkit.WithPlayerData; import org.assertj.core.util.introspection.IntrospectionError; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_property_not_in_given_values_Test.java b/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_property_not_in_given_values_Test.java index d5c47877cb..d043b39b81 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_property_not_in_given_values_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/filter/Filter_with_property_not_in_given_values_Test.java @@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.filter.Filters.filter; -import org.assertj.core.test.Player; -import org.assertj.core.test.WithPlayerData; +import org.assertj.core.testkit.Player; +import org.assertj.core.testkit.WithPlayerData; import org.assertj.core.util.introspection.IntrospectionError; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/float2darray/Float2DArrayAssert_contains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/float2darray/Float2DArrayAssert_contains_at_Index_Test.java index 6d03efd649..6c601cfd1a 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/float2darray/Float2DArrayAssert_contains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/float2darray/Float2DArrayAssert_contains_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.float2darray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.Float2DArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/float2darray/Float2DArrayAssert_doesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/float2darray/Float2DArrayAssert_doesNotContain_at_Index_Test.java index 2c9d1fcaf5..20cf400c76 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/float2darray/Float2DArrayAssert_doesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/float2darray/Float2DArrayAssert_doesNotContain_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.float2darray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.Float2DArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/float2darray/Float2DArrayAssert_usingCustomComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/float2darray/Float2DArrayAssert_usingCustomComparator_Test.java index 13852c9b26..73c13d284c 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/float2darray/Float2DArrayAssert_usingCustomComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/float2darray/Float2DArrayAssert_usingCustomComparator_Test.java @@ -13,11 +13,11 @@ package org.assertj.core.api.float2darray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.Float2DArrayAssert; import org.assertj.core.api.Float2DArrayAssertBaseTest; -import org.assertj.core.test.AlwaysEqualComparator; +import org.assertj.core.testkit.AlwaysEqualComparator; import org.junit.jupiter.api.Test; class Float2DArrayAssert_usingCustomComparator_Test extends Float2DArrayAssertBaseTest { diff --git a/assertj-core/src/test/java/org/assertj/core/api/float_/FloatAssert_isEqualTo_float_Test.java b/assertj-core/src/test/java/org/assertj/core/api/float_/FloatAssert_isEqualTo_float_Test.java index 382b39d25a..84b36d16d5 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/float_/FloatAssert_isEqualTo_float_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/float_/FloatAssert_isEqualTo_float_Test.java @@ -15,7 +15,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/api/float_/FloatAssert_isNotEqualTo_float_primitive_Test.java b/assertj-core/src/test/java/org/assertj/core/api/float_/FloatAssert_isNotEqualTo_float_primitive_Test.java index 01aedb5ca9..cf90c8bec1 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/float_/FloatAssert_isNotEqualTo_float_primitive_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/float_/FloatAssert_isNotEqualTo_float_primitive_Test.java @@ -15,7 +15,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.AlwaysDifferentComparator.ALWAY_DIFFERENT; +import static org.assertj.core.testkit.AlwaysDifferentComparator.ALWAY_DIFFERENT; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/api/float_/FloatAssert_isZero_Test.java b/assertj-core/src/test/java/org/assertj/core/api/float_/FloatAssert_isZero_Test.java index aeecb6fd4e..ce4ec8195a 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/float_/FloatAssert_isZero_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/float_/FloatAssert_isZero_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/float_/FloatAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/float_/FloatAssert_usingComparator_Test.java index bc7d08f443..77ba7d8f3b 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/float_/FloatAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/float_/FloatAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.float_; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/float_/FloatAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/float_/FloatAssert_usingDefaultComparator_Test.java index 00e81279f5..2262df8964 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/float_/FloatAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/float_/FloatAssert_usingDefaultComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.float_; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.FloatAssert; import org.assertj.core.api.FloatAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsAnyOf_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsAnyOf_Test.java index 6463fe81c7..28039236da 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsAnyOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsAnyOf_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.floatarray; -import static org.assertj.core.test.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsAnyOf_with_Float_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsAnyOf_with_Float_array_Test.java index bac17b9753..b60ed71f0e 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsAnyOf_with_Float_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsAnyOf_with_Float_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsExactlyInAnyOrder_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsExactlyInAnyOrder_Test.java index 6c3bdc7f1e..a9dafd66a2 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsExactlyInAnyOrder_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsExactlyInAnyOrder_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.floatarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsExactlyInAnyOrder_with_Float_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsExactlyInAnyOrder_with_Float_array_Test.java index 20d9322136..3d92b4d970 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsExactlyInAnyOrder_with_Float_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsExactlyInAnyOrder_with_Float_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsExactly_Test.java index 10ec76a4fb..301d2369a3 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsExactly_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.withPrecision; import static org.assertj.core.api.Assertions.within; -import static org.assertj.core.test.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsExactly_with_Float_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsExactly_with_Float_array_Test.java index 8b49252bed..ff45f4be6e 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsExactly_with_Float_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsExactly_with_Float_array_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.withPrecision; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsOnlyOnce_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsOnlyOnce_Test.java index 3b00c5c852..bc4a24af8f 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsOnlyOnce_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsOnlyOnce_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.withPrecision; -import static org.assertj.core.test.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsOnlyOnce_with_Float_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsOnlyOnce_with_Float_array_Test.java index cd64938570..3e0e325442 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsOnlyOnce_with_Float_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsOnlyOnce_with_Float_array_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.withPrecision; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsOnly_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsOnly_Test.java index acf40b141e..bccb98b9c1 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsOnly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsOnly_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.withPrecision; import static org.assertj.core.api.Assertions.within; -import static org.assertj.core.test.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsOnly_with_Float_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsOnly_with_Float_array_Test.java index 140ea08887..eaf26b6efe 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsOnly_with_Float_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsOnly_with_Float_array_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.withPrecision; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsSequence_Test.java index 8d94faf798..7c107cfdfe 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsSequence_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.withPrecision; -import static org.assertj.core.test.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsSequence_with_Float_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsSequence_with_Float_array_Test.java index 298609c832..ec08c11e0e 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsSequence_with_Float_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsSequence_with_Float_array_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.withPrecision; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsSubsequence_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsSubsequence_Test.java index 653cff4710..7f6129e636 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsSubsequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsSubsequence_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.withPrecision; -import static org.assertj.core.test.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsSubsequence_with_Float_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsSubsequence_with_Float_array_Test.java index 7adc16f89e..ec5c8b675d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsSubsequence_with_Float_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_containsSubsequence_with_Float_array_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.withPrecision; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_contains_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_contains_Test.java index c6813470ef..5e15ac2017 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_contains_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_contains_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.withPrecision; -import static org.assertj.core.test.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_contains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_contains_at_Index_Test.java index 2394d9b803..54e3fbeef5 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_contains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_contains_at_Index_Test.java @@ -15,8 +15,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.atIndex; import static org.assertj.core.api.Assertions.withPrecision; -import static org.assertj.core.test.FloatArrays.arrayOf; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.FloatArrays.arrayOf; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_contains_with_Float_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_contains_with_Float_array_Test.java index 525ffc2578..2e1a124b18 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_contains_with_Float_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_contains_with_Float_array_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.withPrecision; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_doesNotContain_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_doesNotContain_Test.java index a14db565cf..9e39b8adf6 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_doesNotContain_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_doesNotContain_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.withPrecision; -import static org.assertj.core.test.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_doesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_doesNotContain_at_Index_Test.java index 28e61169b2..c245e9b9fe 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_doesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_doesNotContain_at_Index_Test.java @@ -15,8 +15,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.atIndex; import static org.assertj.core.api.Assertions.withPrecision; -import static org.assertj.core.test.FloatArrays.arrayOf; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.FloatArrays.arrayOf; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_doesNotContain_with_Float_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_doesNotContain_with_Float_array_Test.java index bdcdc6dd14..8338b1bfeb 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_doesNotContain_with_Float_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_doesNotContain_with_Float_array_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.withPrecision; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_doesNotHaveDuplicates_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_doesNotHaveDuplicates_Test.java index a53501cd05..bc2cf4388b 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_doesNotHaveDuplicates_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_doesNotHaveDuplicates_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.withPrecision; -import static org.assertj.core.test.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_endsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_endsWith_Test.java index 5cefc6ef5c..8ae26bd397 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_endsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_endsWith_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.withPrecision; -import static org.assertj.core.test.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_endsWith_with_Float_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_endsWith_with_Float_array_Test.java index ac43d23fde..28aaae3fd9 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_endsWith_with_Float_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_endsWith_with_Float_array_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.withPrecision; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_isSortedAccordingToComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_isSortedAccordingToComparator_Test.java index fdf5801946..8e86c46294 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_isSortedAccordingToComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_isSortedAccordingToComparator_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.floatarray; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import static org.mockito.Mockito.verify; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_startsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_startsWith_Test.java index 716331b2b6..9ca15d0ecf 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_startsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_startsWith_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.withPrecision; -import static org.assertj.core.test.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_startsWith_with_Float_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_startsWith_with_Float_array_Test.java index aed62a08d4..c2bf0eee71 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_startsWith_with_Float_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_startsWith_with_Float_array_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.withPrecision; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.FloatArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_usingComparator_Test.java index 7aa62f775f..1060efc198 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.floatarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_usingDefaultComparator_Test.java index 7d5f646e69..d9d4409215 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_usingDefaultComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.floatarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.FloatArrayAssert; import org.assertj.core.api.FloatArrayAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_usingDefaultElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_usingDefaultElementComparator_Test.java index 97235f4d29..f3e42c987b 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_usingDefaultElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_usingDefaultElementComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.floatarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.FloatArrayAssert; import org.assertj.core.api.FloatArrayAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_usingElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_usingElementComparator_Test.java index 94b35a117f..138f187d44 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_usingElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/floatarray/FloatArrayAssert_usingElementComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.floatarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/inputstream/InputStreamAssert_asString_with_charset_Test.java b/assertj-core/src/test/java/org/assertj/core/api/inputstream/InputStreamAssert_asString_with_charset_Test.java index ba5225e36e..6a9ca6ceb4 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/inputstream/InputStreamAssert_asString_with_charset_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/inputstream/InputStreamAssert_asString_with_charset_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.BDDAssertions.thenCode; import static org.assertj.core.api.BDDAssertions.thenNullPointerException; import static org.assertj.core.api.BDDAssertions.thenThrownBy; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.AssertionsUtil.expectAssumptionNotMetException; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/api/instant/InstantAssert_isEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/api/instant/InstantAssert_isEqualTo_Test.java index 143b207426..2c620a36cb 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/instant/InstantAssert_isEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/instant/InstantAssert_isEqualTo_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import java.sql.Timestamp; diff --git a/assertj-core/src/test/java/org/assertj/core/api/int2darray/Int2DArrayAssert_contains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/int2darray/Int2DArrayAssert_contains_at_Index_Test.java index 6222a7bc76..f5b32eb9c4 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/int2darray/Int2DArrayAssert_contains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/int2darray/Int2DArrayAssert_contains_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.int2darray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.Int2DArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/int2darray/Int2DArrayAssert_doesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/int2darray/Int2DArrayAssert_doesNotContain_at_Index_Test.java index 2452041d38..6ae31033d9 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/int2darray/Int2DArrayAssert_doesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/int2darray/Int2DArrayAssert_doesNotContain_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.int2darray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.Int2DArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/int2darray/Int2DArrayAssert_usingCustomComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/int2darray/Int2DArrayAssert_usingCustomComparator_Test.java index d204b6c878..aa06676542 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/int2darray/Int2DArrayAssert_usingCustomComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/int2darray/Int2DArrayAssert_usingCustomComparator_Test.java @@ -13,11 +13,11 @@ package org.assertj.core.api.int2darray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.Int2DArrayAssert; import org.assertj.core.api.Int2DArrayAssertBaseTest; -import org.assertj.core.test.AlwaysEqualComparator; +import org.assertj.core.testkit.AlwaysEqualComparator; import org.junit.jupiter.api.Test; class Int2DArrayAssert_usingCustomComparator_Test extends Int2DArrayAssertBaseTest { diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsAnyOf_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsAnyOf_Test.java index 6841ace8ca..564a0e30b9 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsAnyOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsAnyOf_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.intarray; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.IntArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsAnyOf_with_Integer_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsAnyOf_with_Integer_array_Test.java index 6d56ccfa36..86902ca2c1 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsAnyOf_with_Integer_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsAnyOf_with_Integer_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.IntArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsExactlyInAnyOrder_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsExactlyInAnyOrder_Test.java index e7eed88d33..74c40e065c 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsExactlyInAnyOrder_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsExactlyInAnyOrder_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.intarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.IntArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsExactlyInAnyOrder_with_Integer_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsExactlyInAnyOrder_with_Integer_array_Test.java index 4b6935bb2e..b1f653b0e7 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsExactlyInAnyOrder_with_Integer_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsExactlyInAnyOrder_with_Integer_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.IntArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsExactly_Test.java index 9f462c40bf..4ab686dd72 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsExactly_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.intarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.IntArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsExactly_with_Integer_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsExactly_with_Integer_array_Test.java index 749d316b50..683c81532c 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsExactly_with_Integer_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsExactly_with_Integer_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.IntArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsOnlyOnce_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsOnlyOnce_Test.java index 8ad9086dad..9dae827887 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsOnlyOnce_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsOnlyOnce_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.intarray; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.IntArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsOnlyOnce_with_Integer_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsOnlyOnce_with_Integer_array_Test.java index 4883d60086..48be5ef6cc 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsOnlyOnce_with_Integer_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsOnlyOnce_with_Integer_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.IntArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsOnly_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsOnly_Test.java index 8402f00e2e..ff830e4cbd 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsOnly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsOnly_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.intarray; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.IntArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsOnly_with_Integer_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsOnly_with_Integer_array_Test.java index 214e0b68f7..b2bfe36619 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsOnly_with_Integer_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsOnly_with_Integer_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.IntArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsSequence_Test.java index 219b045575..8f35d28bdd 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsSequence_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.intarray; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.IntArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsSequence_with_Integer_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsSequence_with_Integer_array_Test.java index 1655881d39..de57872c3b 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsSequence_with_Integer_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsSequence_with_Integer_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.IntArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsSubsequence_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsSubsequence_Test.java index 81acabaf40..d22c1b11c0 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsSubsequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsSubsequence_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.intarray; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.IntArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsSubsequence_with_Integer_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsSubsequence_with_Integer_array_Test.java index b67d0d0cbc..d2bd72bb90 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsSubsequence_with_Integer_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_containsSubsequence_with_Integer_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.IntArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_contains_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_contains_Test.java index b67c908c9e..d23ff69a35 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_contains_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_contains_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.intarray; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.IntArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_contains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_contains_at_Index_Test.java index c68327cbb7..f16b59eb23 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_contains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_contains_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.intarray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.IntArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_contains_with_Integer_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_contains_with_Integer_array_Test.java index b829db28dd..199b9402c6 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_contains_with_Integer_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_contains_with_Integer_array_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.intarray; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.IntArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_doesNotContain_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_doesNotContain_Test.java index 010844cd91..ace1a7469b 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_doesNotContain_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_doesNotContain_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.intarray; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.IntArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_doesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_doesNotContain_at_Index_Test.java index a2ef1675b8..ff838466b4 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_doesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_doesNotContain_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.intarray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.IntArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_doesNotContain_with_Integer_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_doesNotContain_with_Integer_array_Test.java index 07af9691ef..92b96cef2a 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_doesNotContain_with_Integer_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_doesNotContain_with_Integer_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.IntArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_endsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_endsWith_Test.java index a7b937e753..e0c6d2dd23 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_endsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_endsWith_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.intarray; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.IntArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_endsWith_with_Integer_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_endsWith_with_Integer_array_Test.java index d7ef998558..018d42ebb5 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_endsWith_with_Integer_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_endsWith_with_Integer_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.IntArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_isSortedAccordingToComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_isSortedAccordingToComparator_Test.java index c0ed12d5fb..a9f5cb1ddc 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_isSortedAccordingToComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_isSortedAccordingToComparator_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.intarray; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import static org.mockito.Mockito.verify; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_startsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_startsWith_Test.java index 82d4d27bc3..0a2f51b4f6 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_startsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_startsWith_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.intarray; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.IntArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_startsWith_with_Integer_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_startsWith_with_Integer_array_Test.java index c5f236559b..b098b79755 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_startsWith_with_Integer_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_startsWith_with_Integer_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.IntArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_usingComparator_Test.java index d4b7c537ae..25693f1218 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.intarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_usingDefaultComparator_Test.java index 295133606b..d0abbec733 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_usingDefaultComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.intarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.IntArrayAssert; import org.assertj.core.api.IntArrayAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_usingDefaultElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_usingDefaultElementComparator_Test.java index e54d79c59f..176a4cb2f7 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_usingDefaultElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_usingDefaultElementComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.intarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.IntArrayAssert; import org.assertj.core.api.IntArrayAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_usingElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_usingElementComparator_Test.java index 657acc9bc4..d194275194 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_usingElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/intarray/IntArrayAssert_usingElementComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.intarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/integer_/IntegerAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/integer_/IntegerAssert_usingComparator_Test.java index ff060b73e0..f213513428 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/integer_/IntegerAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/integer_/IntegerAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.integer_; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/integer_/IntegerAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/integer_/IntegerAssert_usingDefaultComparator_Test.java index df4b721c01..f8705983fc 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/integer_/IntegerAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/integer_/IntegerAssert_usingDefaultComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.integer_; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.IntegerAssert; import org.assertj.core.api.IntegerAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_extractingResultOf_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_extractingResultOf_Test.java index 0fd3ad10c7..5031bd5931 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_extractingResultOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_extractingResultOf_Test.java @@ -19,17 +19,17 @@ import static org.assertj.core.api.GroupAssertTestHelper.comparatorForElementFieldsWithTypeOf; import static org.assertj.core.api.GroupAssertTestHelper.comparatorsByTypeOf; import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; import static org.assertj.core.util.Lists.newArrayList; import java.sql.Timestamp; import org.assertj.core.api.AbstractIterableAssert; import org.assertj.core.api.AbstractListAssert; -import org.assertj.core.test.CaseInsensitiveStringComparator; -import org.assertj.core.test.FluentJedi; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.FluentJedi; +import org.assertj.core.testkit.Name; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_extractingResultOf_with_SortedSet_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_extractingResultOf_with_SortedSet_Test.java index 2837763f23..2a28b54cf6 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_extractingResultOf_with_SortedSet_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_extractingResultOf_with_SortedSet_Test.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.GroupAssertTestHelper.comparatorForElementFieldsWithTypeOf; import static org.assertj.core.api.GroupAssertTestHelper.comparatorsByTypeOf; import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; import java.sql.Timestamp; import java.util.SortedSet; @@ -29,9 +29,9 @@ import org.assertj.core.api.AbstractIterableAssert; import org.assertj.core.api.AbstractListAssert; -import org.assertj.core.test.CaseInsensitiveStringComparator; -import org.assertj.core.test.FluentJedi; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.FluentJedi; +import org.assertj.core.testkit.Name; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_extracting_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_extracting_Test.java index 7d9729d048..b736fdf2a4 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_extracting_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_extracting_Test.java @@ -29,9 +29,9 @@ import static org.assertj.core.data.TolkienCharacter.Race.MAN; import static org.assertj.core.extractor.Extractors.byName; import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_TUPLE; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_TUPLE; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; @@ -46,8 +46,8 @@ import org.assertj.core.data.TolkienCharacter; import org.assertj.core.extractor.Extractors; import org.assertj.core.groups.Tuple; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.assertj.core.util.introspection.IntrospectionError; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_extracting_with_SortedSet_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_extracting_with_SortedSet_Test.java index 7f255f8148..960dd92fea 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_extracting_with_SortedSet_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_extracting_with_SortedSet_Test.java @@ -32,9 +32,9 @@ import static org.assertj.core.data.TolkienCharacter.Race.MAN; import static org.assertj.core.extractor.Extractors.byName; import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_TUPLE; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_TUPLE; import static org.assertj.core.util.Lists.list; import java.sql.Timestamp; @@ -46,8 +46,8 @@ import org.assertj.core.data.TolkienCharacter; import org.assertj.core.extractor.Extractors; import org.assertj.core.groups.Tuple; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.assertj.core.util.introspection.IntrospectionError; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_extracting_with_throwing_extractor_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_extracting_with_throwing_extractor_Test.java index c96ca13ec3..7b4af1806e 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_extracting_with_throwing_extractor_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_extracting_with_throwing_extractor_Test.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.GroupAssertTestHelper.throwingFirstNameExtractor; import static org.assertj.core.api.GroupAssertTestHelper.throwingLastNameExtractor; import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_TUPLE; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_TUPLE; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.list; @@ -29,8 +29,8 @@ import org.assertj.core.api.AbstractListAssert; import org.assertj.core.api.ThrowableAssert.ThrowingCallable; import org.assertj.core.groups.Tuple; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.junit.jupiter.api.Test; class IterableAssert_extracting_with_throwing_extractor_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOnAssertions_ThrowingConsumer_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOnAssertions_ThrowingConsumer_Test.java index 7e65b3711d..67e4559f19 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOnAssertions_ThrowingConsumer_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOnAssertions_ThrowingConsumer_Test.java @@ -26,8 +26,8 @@ import org.assertj.core.data.TolkienCharacter; import org.assertj.core.data.TolkienCharacterAssert; import org.assertj.core.data.TolkienCharacterAssertFactory; -import org.assertj.core.test.CaseInsensitiveStringComparator; -import org.assertj.core.test.Employee; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.Employee; import org.junit.jupiter.api.Test; class IterableAssert_filteredOnAssertions_ThrowingConsumer_Test extends IterableAssert_filtered_baseTest { diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOnAssertions_consumer_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOnAssertions_consumer_Test.java index 4a7f387cb9..da807034eb 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOnAssertions_consumer_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOnAssertions_consumer_Test.java @@ -24,8 +24,8 @@ import org.assertj.core.data.TolkienCharacter; import org.assertj.core.data.TolkienCharacterAssert; import org.assertj.core.data.TolkienCharacterAssertFactory; -import org.assertj.core.test.CaseInsensitiveStringComparator; -import org.assertj.core.test.Employee; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.Employee; import org.junit.jupiter.api.Test; class IterableAssert_filteredOnAssertions_consumer_Test extends IterableAssert_filtered_baseTest { diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOnNull_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOnNull_Test.java index 4112149687..06047803cd 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOnNull_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOnNull_Test.java @@ -17,14 +17,14 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.data.TolkienCharacter.Race.HOBBIT; import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; -import static org.assertj.core.test.Name.name; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.Name.name; import org.assertj.core.api.IterableAssert; import org.assertj.core.data.TolkienCharacter; import org.assertj.core.data.TolkienCharacterAssert; import org.assertj.core.data.TolkienCharacterAssertFactory; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Name; import org.assertj.core.util.introspection.IntrospectionError; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_Test.java index aec18153f8..d0b2f002e9 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_Test.java @@ -21,8 +21,8 @@ import static org.assertj.core.api.Assertions.not; import static org.assertj.core.api.Assertions.setAllowExtractingPrivateFields; import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; -import static org.assertj.core.test.Name.lastNameComparator; -import static org.assertj.core.test.Name.name; +import static org.assertj.core.testkit.Name.lastNameComparator; +import static org.assertj.core.testkit.Name.name; import static org.assertj.core.util.Sets.newHashSet; import java.util.Set; @@ -32,8 +32,8 @@ import org.assertj.core.data.TolkienCharacter; import org.assertj.core.data.TolkienCharacterAssert; import org.assertj.core.data.TolkienCharacterAssertFactory; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.assertj.core.util.introspection.IntrospectionError; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_condition_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_condition_Test.java index 8fb1bef56b..14629c7d30 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_condition_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_condition_Test.java @@ -24,8 +24,8 @@ import org.assertj.core.data.TolkienCharacterAssert; import org.assertj.core.data.TolkienCharacterAssertFactory; import org.assertj.core.presentation.Representation; -import org.assertj.core.test.CaseInsensitiveStringComparator; -import org.assertj.core.test.Employee; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.Employee; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_function_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_function_Test.java index ade36f07ef..38da1692b7 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_function_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_function_Test.java @@ -16,15 +16,15 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; -import static org.assertj.core.test.Name.lastNameComparator; -import static org.assertj.core.test.Name.name; +import static org.assertj.core.testkit.Name.lastNameComparator; +import static org.assertj.core.testkit.Name.name; import static org.assertj.core.util.Sets.newHashSet; import java.util.function.Function; import org.assertj.core.api.IterableAssert; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_not_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_not_Test.java index d9cc71ec3a..6358351339 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_not_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_not_Test.java @@ -20,11 +20,11 @@ import static org.assertj.core.api.Assertions.not; import static org.assertj.core.api.Assertions.setAllowExtractingPrivateFields; import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; -import static org.assertj.core.test.Name.lastNameComparator; -import static org.assertj.core.test.Name.name; +import static org.assertj.core.testkit.Name.lastNameComparator; +import static org.assertj.core.testkit.Name.name; import org.assertj.core.api.IterableAssert; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Name; import org.assertj.core.util.introspection.IntrospectionError; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_predicate_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_predicate_Test.java index 78675b3992..c8bce8e765 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_predicate_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_predicate_Test.java @@ -24,8 +24,8 @@ import org.assertj.core.data.TolkienCharacter; import org.assertj.core.data.TolkienCharacterAssert; import org.assertj.core.data.TolkienCharacterAssertFactory; -import org.assertj.core.test.CaseInsensitiveStringComparator; -import org.assertj.core.test.Employee; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.Employee; import org.junit.jupiter.api.Test; class IterableAssert_filteredOn_predicate_Test extends IterableAssert_filtered_baseTest { diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filtered_baseTest.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filtered_baseTest.java index a387cbc8b0..fefc17bb96 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filtered_baseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_filtered_baseTest.java @@ -19,8 +19,8 @@ import java.util.List; import org.assertj.core.data.TolkienCharacter; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.junit.jupiter.api.BeforeEach; public class IterableAssert_filtered_baseTest { @@ -50,4 +50,4 @@ protected static Iterable hobbits() { return asList(frodo, sam); } -} \ No newline at end of file +} diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_flatExtracting_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_flatExtracting_Test.java index 613ef9a2b8..1e2bad02b3 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_flatExtracting_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_flatExtracting_Test.java @@ -20,9 +20,9 @@ import static org.assertj.core.api.GroupAssertTestHelper.comparatorForElementFieldsWithTypeOf; import static org.assertj.core.api.GroupAssertTestHelper.comparatorsByTypeOf; import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.Lists.list; @@ -32,8 +32,8 @@ import org.assertj.core.api.AbstractIterableAssert; import org.assertj.core.api.AbstractListAssert; -import org.assertj.core.test.AlwaysEqualComparator; -import org.assertj.core.test.CartoonCharacter; +import org.assertj.core.testkit.AlwaysEqualComparator; +import org.assertj.core.testkit.CartoonCharacter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_flatExtracting_with_SortedSet_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_flatExtracting_with_SortedSet_Test.java index 65ba22d21a..5ca0e85053 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_flatExtracting_with_SortedSet_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_flatExtracting_with_SortedSet_Test.java @@ -20,9 +20,9 @@ import static org.assertj.core.api.GroupAssertTestHelper.comparatorForElementFieldsWithTypeOf; import static org.assertj.core.api.GroupAssertTestHelper.comparatorsByTypeOf; import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.sql.Timestamp; import java.util.List; @@ -32,8 +32,8 @@ import org.assertj.core.api.AbstractIterableAssert; import org.assertj.core.api.AbstractListAssert; -import org.assertj.core.test.AlwaysEqualComparator; -import org.assertj.core.test.CartoonCharacter; +import org.assertj.core.testkit.AlwaysEqualComparator; +import org.assertj.core.testkit.CartoonCharacter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_flatExtracting_with_String_parameter_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_flatExtracting_with_String_parameter_Test.java index 4612210117..6bd4f777c4 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_flatExtracting_with_String_parameter_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_flatExtracting_with_String_parameter_Test.java @@ -18,16 +18,16 @@ import static org.assertj.core.api.GroupAssertTestHelper.comparatorForElementFieldsWithTypeOf; import static org.assertj.core.api.GroupAssertTestHelper.comparatorsByTypeOf; import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import static org.assertj.core.util.Lists.newArrayList; import java.sql.Timestamp; import org.assertj.core.api.AbstractListAssert; -import org.assertj.core.test.AlwaysEqualComparator; -import org.assertj.core.test.CartoonCharacter; +import org.assertj.core.testkit.AlwaysEqualComparator; +import org.assertj.core.testkit.CartoonCharacter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_flatExtracting_with_multiple_extractors_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_flatExtracting_with_multiple_extractors_Test.java index c9ab3e756d..1b36cb4158 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_flatExtracting_with_multiple_extractors_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_flatExtracting_with_multiple_extractors_Test.java @@ -25,8 +25,8 @@ import static org.assertj.core.data.TolkienCharacter.Race.MAIA; import static org.assertj.core.data.TolkienCharacter.Race.MAN; import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import java.sql.Timestamp; @@ -36,7 +36,7 @@ import org.assertj.core.api.AbstractListAssert; import org.assertj.core.data.TolkienCharacter; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_flatMap_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_flatMap_Test.java index 82ff6ef71d..bde26c2fe0 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_flatMap_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_flatMap_Test.java @@ -23,7 +23,7 @@ import java.util.function.Function; import org.assertj.core.api.AbstractIterableAssert; -import org.assertj.core.test.CartoonCharacter; +import org.assertj.core.testkit.CartoonCharacter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_hasOnlyOneElementSatisfying_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_hasOnlyOneElementSatisfying_Test.java index 2578e9e98d..d1ad551fb9 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_hasOnlyOneElementSatisfying_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_hasOnlyOneElementSatisfying_Test.java @@ -21,7 +21,7 @@ import java.util.List; import org.assertj.core.api.SoftAssertions; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.Test; @SuppressWarnings("deprecation") diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingComparatorForType_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingComparatorForType_Test.java index 34d8663d1d..009e3d148d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingComparatorForType_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingComparatorForType_Test.java @@ -16,8 +16,8 @@ import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; -import static org.assertj.core.test.NeverEqualComparator.NEVER_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.NeverEqualComparator.NEVER_EQUALS_STRING; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.BigDecimalComparator.BIG_DECIMAL_COMPARATOR; import static org.assertj.core.util.Lists.list; @@ -30,7 +30,7 @@ import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.internal.ExtendedByTypesComparator; import org.assertj.core.internal.Iterables; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -164,7 +164,7 @@ void should_fail_because_of_comparator_set_last() { + " [Luke the Jedi]%n" + "when comparing values using field/property by field/property comparator on all fields/properties%n" + "Comparators used:%n" - + "- for elements fields (by type): {Double -> DoubleComparator[precision=1.0E-15], Float -> FloatComparator[precision=1.0E-6], String -> org.assertj.core.test.NeverEqualComparator, Path -> lexicographic comparator (Path natural order)}%n" + + "- for elements fields (by type): {Double -> DoubleComparator[precision=1.0E-15], Float -> FloatComparator[precision=1.0E-6], String -> org.assertj.core.testkit.NeverEqualComparator, Path -> lexicographic comparator (Path natural order)}%n" + "- for elements (by type): {Double -> DoubleComparator[precision=1.0E-15], Float -> FloatComparator[precision=1.0E-6], String -> AlwaysEqualComparator, Path -> lexicographic comparator (Path natural order)}")); } diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingElementComparatorIgnoringFields_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingElementComparatorIgnoringFields_Test.java index 15a299ad8c..569d005d9a 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingElementComparatorIgnoringFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingElementComparatorIgnoringFields_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.iterable; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; import static org.assertj.core.util.Lists.list; import java.util.Comparator; @@ -24,7 +24,7 @@ import org.assertj.core.internal.ExtendedByTypesComparator; import org.assertj.core.internal.IgnoringFieldsComparator; import org.assertj.core.internal.Iterables; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingElementComparatorOnFields_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingElementComparatorOnFields_Test.java index 586688f7aa..3bfc53d949 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingElementComparatorOnFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingElementComparatorOnFields_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.iterable; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; import static org.assertj.core.util.Lists.list; import java.util.Comparator; @@ -24,7 +24,7 @@ import org.assertj.core.internal.ExtendedByTypesComparator; import org.assertj.core.internal.Iterables; import org.assertj.core.internal.OnFieldsComparator; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingFieldByFieldElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingFieldByFieldElementComparator_Test.java index 6967ce6ccc..49a3312a49 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingFieldByFieldElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingFieldByFieldElementComparator_Test.java @@ -17,8 +17,8 @@ import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.Lists.newArrayList; import java.util.Comparator; @@ -30,7 +30,7 @@ import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.internal.IterableElementComparisonStrategy; import org.assertj.core.internal.Iterables; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingRecursiveFieldByFieldElementComparatorIgnoringFields_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingRecursiveFieldByFieldElementComparatorIgnoringFields_Test.java index 427d31733d..d147185ec8 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingRecursiveFieldByFieldElementComparatorIgnoringFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingRecursiveFieldByFieldElementComparatorIgnoringFields_Test.java @@ -22,8 +22,8 @@ import org.assertj.core.internal.ConfigurableRecursiveFieldByFieldComparator; import org.assertj.core.internal.IterableElementComparisonStrategy; import org.assertj.core.internal.Iterables; -import org.assertj.core.test.Name; -import org.assertj.core.test.Player; +import org.assertj.core.testkit.Name; +import org.assertj.core.testkit.Player; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingRecursiveFieldByFieldElementComparatorOnFields_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingRecursiveFieldByFieldElementComparatorOnFields_Test.java index 2616871339..ab2a801c37 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingRecursiveFieldByFieldElementComparatorOnFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingRecursiveFieldByFieldElementComparatorOnFields_Test.java @@ -22,8 +22,8 @@ import org.assertj.core.internal.ConfigurableRecursiveFieldByFieldComparator; import org.assertj.core.internal.IterableElementComparisonStrategy; import org.assertj.core.internal.Iterables; -import org.assertj.core.test.Name; -import org.assertj.core.test.Player; +import org.assertj.core.testkit.Name; +import org.assertj.core.testkit.Player; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingRecursiveFieldByFieldElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingRecursiveFieldByFieldElementComparator_Test.java index d89ae6f54a..c375c455af 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingRecursiveFieldByFieldElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterable/IterableAssert_usingRecursiveFieldByFieldElementComparator_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.configuration.ConfigurationProvider.CONFIGURATION_PROVIDER; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.Lists.list; diff --git a/assertj-core/src/test/java/org/assertj/core/api/iterator/IteratorAssert_isUnmodifiable_Test.java b/assertj-core/src/test/java/org/assertj/core/api/iterator/IteratorAssert_isUnmodifiable_Test.java index b556778060..0afe6eb061 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/iterator/IteratorAssert_isUnmodifiable_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/iterator/IteratorAssert_isUnmodifiable_Test.java @@ -38,7 +38,7 @@ import org.apache.commons.collections4.set.UnmodifiableSet; import org.apache.commons.collections4.set.UnmodifiableSortedSet; import org.assertj.core.error.ErrorMessageFactory; -import org.assertj.core.test.jdk11.Jdk11; +import org.assertj.core.testkit.jdk11.Jdk11; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_assertionState_propagation_with_extracting_Test.java b/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_assertionState_propagation_with_extracting_Test.java index a2f045f093..9ae796bac2 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_assertionState_propagation_with_extracting_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_assertionState_propagation_with_extracting_Test.java @@ -22,9 +22,9 @@ import static org.assertj.core.api.GroupAssertTestHelper.throwingFirstNameExtractor; import static org.assertj.core.extractor.Extractors.byName; import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_TUPLE; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_TUPLE; import static org.assertj.core.util.Lists.newArrayList; import java.sql.Timestamp; @@ -32,8 +32,8 @@ import org.assertj.core.api.AbstractListAssert; import org.assertj.core.groups.Tuple; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_contains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_contains_at_Index_Test.java index 8f6fcf0c47..f940eb01bd 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_contains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_contains_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.list; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.ListAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_doesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_doesNotContain_at_Index_Test.java index 40cec61b50..17d129a4f0 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_doesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_doesNotContain_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.list; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.ListAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_has_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_has_at_Index_Test.java index 36ae939e21..c936718bef 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_has_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_has_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.list; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.Condition; diff --git a/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_isSortedAccordingToComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_isSortedAccordingToComparator_Test.java index 8a642940ef..48925c1716 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_isSortedAccordingToComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_isSortedAccordingToComparator_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.list; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import static org.mockito.Mockito.verify; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_is_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_is_at_Index_Test.java index 7fe5f144f8..2227811e9b 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_is_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_is_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.list; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.Condition; diff --git a/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_satisfies_at_index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_satisfies_at_index_Test.java index b17b568799..13411e5909 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_satisfies_at_index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_satisfies_at_index_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.list; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import java.util.function.Consumer; diff --git a/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_usingComparator_Test.java index c760b9e839..50f8969312 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.list; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; import java.util.List; diff --git a/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_usingDefaultComparator_Test.java index 6e30bee4f5..fb58069deb 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/list/ListAssert_usingDefaultComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.list; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.ListAssert; import org.assertj.core.api.ListAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/localdate/LocalDateAssert_isEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/api/localdate/LocalDateAssert_isEqualTo_Test.java index 0c19284ed7..135ebf0f00 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/localdate/LocalDateAssert_isEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/localdate/LocalDateAssert_isEqualTo_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import java.time.LocalDate; diff --git a/assertj-core/src/test/java/org/assertj/core/api/localtime/LocalTimeAssert_isEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/api/localtime/LocalTimeAssert_isEqualTo_Test.java index bbccc1c2f8..f6af56d323 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/localtime/LocalTimeAssert_isEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/localtime/LocalTimeAssert_isEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import java.time.LocalTime; diff --git a/assertj-core/src/test/java/org/assertj/core/api/long2darray/Long2DArrayAssert_contains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/long2darray/Long2DArrayAssert_contains_at_Index_Test.java index 28a2df1663..acd9623671 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/long2darray/Long2DArrayAssert_contains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/long2darray/Long2DArrayAssert_contains_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.long2darray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.Long2DArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/long2darray/Long2DArrayAssert_doesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/long2darray/Long2DArrayAssert_doesNotContain_at_Index_Test.java index cadc387c96..b412213e4e 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/long2darray/Long2DArrayAssert_doesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/long2darray/Long2DArrayAssert_doesNotContain_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.long2darray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.Long2DArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/long2darray/Long2DArrayAssert_usingCustomComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/long2darray/Long2DArrayAssert_usingCustomComparator_Test.java index 72a4a3b998..0afad0137f 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/long2darray/Long2DArrayAssert_usingCustomComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/long2darray/Long2DArrayAssert_usingCustomComparator_Test.java @@ -13,11 +13,11 @@ package org.assertj.core.api.long2darray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.Long2DArrayAssert; import org.assertj.core.api.Long2DArrayAssertBaseTest; -import org.assertj.core.test.AlwaysEqualComparator; +import org.assertj.core.testkit.AlwaysEqualComparator; import org.junit.jupiter.api.Test; class Long2DArrayAssert_usingCustomComparator_Test extends Long2DArrayAssertBaseTest { diff --git a/assertj-core/src/test/java/org/assertj/core/api/long_/LongAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/long_/LongAssert_usingComparator_Test.java index 40e49224aa..1e779dcb5b 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/long_/LongAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/long_/LongAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.long_; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/long_/LongAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/long_/LongAssert_usingDefaultComparator_Test.java index a3dbaf6ff5..f6bfe7637c 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/long_/LongAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/long_/LongAssert_usingDefaultComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.long_; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.LongAssert; import org.assertj.core.api.LongAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsAnyOf_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsAnyOf_Test.java index 76ac1619f9..152084c7eb 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsAnyOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsAnyOf_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.longarray; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.LongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsAnyOf_with_Long_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsAnyOf_with_Long_array_Test.java index 21d497c6ed..7816cd53f0 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsAnyOf_with_Long_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsAnyOf_with_Long_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.LongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsExactlyInAnyOrder_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsExactlyInAnyOrder_Test.java index c317c21b23..5b9fedd199 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsExactlyInAnyOrder_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsExactlyInAnyOrder_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.longarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.LongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsExactlyInAnyOrder_with_Long_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsExactlyInAnyOrder_with_Long_array_Test.java index 99de9d2da0..1b996edf07 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsExactlyInAnyOrder_with_Long_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsExactlyInAnyOrder_with_Long_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.LongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsExactly_Test.java index 0662793b42..a7daa7636e 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsExactly_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.longarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.LongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsExactly_with_Long_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsExactly_with_Long_array_Test.java index bec83581dc..2dbbd1e4f3 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsExactly_with_Long_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsExactly_with_Long_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.LongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsOnlyOnce_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsOnlyOnce_Test.java index e800ae7ca5..14f0048740 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsOnlyOnce_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsOnlyOnce_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.longarray; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.LongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsOnlyOnce_with_Long_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsOnlyOnce_with_Long_array_Test.java index 7ea5693fe7..1a933fa6a0 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsOnlyOnce_with_Long_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsOnlyOnce_with_Long_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.LongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsOnly_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsOnly_Test.java index e5adc425f5..1bd313cc63 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsOnly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsOnly_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.longarray; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.LongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsOnly_with_Long_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsOnly_with_Long_array_Test.java index 5ccf74e2ce..41249fe671 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsOnly_with_Long_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsOnly_with_Long_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.LongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsSequence_Test.java index 176aedb22e..ec9176e645 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsSequence_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.longarray; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.LongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsSequence_with_Long_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsSequence_with_Long_array_Test.java index a4c854128e..7f7e6b25a7 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsSequence_with_Long_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsSequence_with_Long_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.LongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsSubsequence_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsSubsequence_Test.java index d45e49554f..4daf632788 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsSubsequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsSubsequence_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.longarray; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.LongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsSubsequence_with_Long_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsSubsequence_with_Long_array_Test.java index 7926698ad5..2495ad0a7d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsSubsequence_with_Long_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_containsSubsequence_with_Long_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.LongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_contains_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_contains_Test.java index b3d21a479c..978c759404 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_contains_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_contains_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.longarray; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.LongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_contains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_contains_at_Index_Test.java index c4b7549b86..417a44a421 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_contains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_contains_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.longarray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.LongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_contains_with_Long_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_contains_with_Long_array_Test.java index 5a15f4cb49..889fa53eb3 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_contains_with_Long_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_contains_with_Long_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.LongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_doesNotContain_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_doesNotContain_Test.java index 99c22e9b5e..8e96ab844d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_doesNotContain_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_doesNotContain_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.longarray; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.LongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_doesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_doesNotContain_at_Index_Test.java index d104682b52..ac9d01f525 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_doesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_doesNotContain_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.longarray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.LongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_doesNotContain_with_Long_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_doesNotContain_with_Long_array_Test.java index a63f24d274..97d0750eee 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_doesNotContain_with_Long_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_doesNotContain_with_Long_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.LongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_endsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_endsWith_Test.java index af3fdae98f..08625e373a 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_endsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_endsWith_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.longarray; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.LongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_endsWith_with_Long_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_endsWith_with_Long_array_Test.java index 3f650be4b2..c85fbfd023 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_endsWith_with_Long_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_endsWith_with_Long_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.LongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_isSortedAccordingToComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_isSortedAccordingToComparator_Test.java index 1e9a6b93e7..32442dac30 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_isSortedAccordingToComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_isSortedAccordingToComparator_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.longarray; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import static org.mockito.Mockito.verify; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_startsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_startsWith_Test.java index 1549d2bf95..2f97d43174 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_startsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_startsWith_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.longarray; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.LongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_startsWith_with_Long_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_startsWith_with_Long_array_Test.java index 0a7af56415..e153494bc4 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_startsWith_with_Long_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_startsWith_with_Long_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.LongArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_usingComparator_Test.java index 1a1e764bdf..e520d02623 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.longarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_usingDefaultComparator_Test.java index 9e73fb9bb0..dc4e66dffe 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_usingDefaultComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.longarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.LongArrayAssert; import org.assertj.core.api.LongArrayAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_usingDefaultElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_usingDefaultElementComparator_Test.java index 6ccbf7025c..8c74b844d0 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_usingDefaultElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_usingDefaultElementComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.longarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.LongArrayAssert; import org.assertj.core.api.LongArrayAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_usingElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_usingElementComparator_Test.java index 21ac3a6a27..c3194e8e30 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_usingElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/longarray/LongArrayAssert_usingElementComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.longarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_containsExactlyEntriesOf_Test.java b/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_containsExactlyEntriesOf_Test.java index a09f3210bf..861410101f 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_containsExactlyEntriesOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_containsExactlyEntriesOf_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.data.MapEntry.entry; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import static org.assertj.core.util.Arrays.array; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_containsExactlyInAnyOrderEntriesOf_Test.java b/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_containsExactlyInAnyOrderEntriesOf_Test.java index 5c35d70823..4c1e39497f 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_containsExactlyInAnyOrderEntriesOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_containsExactlyInAnyOrderEntriesOf_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.data.MapEntry.entry; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import static org.assertj.core.util.Arrays.array; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_containsOnlyKeys_with_Iterable_Test.java b/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_containsOnlyKeys_with_Iterable_Test.java index 92a248e5a6..8c402deeba 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_containsOnlyKeys_with_Iterable_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_containsOnlyKeys_with_Iterable_Test.java @@ -15,7 +15,7 @@ import static java.util.Collections.singleton; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import static org.assertj.core.util.Lists.list; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_extractingFromEntries_Test.java b/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_extractingFromEntries_Test.java index 1eaf785a56..407378056d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_extractingFromEntries_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_extractingFromEntries_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.Assertions.tuple; import static org.assertj.core.data.MapEntry.entry; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_hasSameSizeAs_with_Map_Test.java b/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_hasSameSizeAs_with_Map_Test.java index 4c8151acf2..1548a2d2eb 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_hasSameSizeAs_with_Map_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_hasSameSizeAs_with_Map_Test.java @@ -19,7 +19,7 @@ import org.assertj.core.api.MapAssert; import org.assertj.core.api.MapAssertBaseTest; -import org.assertj.core.test.Maps; +import org.assertj.core.testkit.Maps; /** * Tests for {@link org.assertj.core.api.MapAssert#hasSameSizeAs(java.util.Map)}. diff --git a/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_isUnmodifiable_Test.java b/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_isUnmodifiable_Test.java index 9cfa6bc4bb..8a72797dc5 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_isUnmodifiable_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_isUnmodifiable_Test.java @@ -33,7 +33,7 @@ import org.apache.commons.collections4.map.UnmodifiableMap; import org.apache.commons.collections4.map.UnmodifiableSortedMap; import org.assertj.core.error.ErrorMessageFactory; -import org.assertj.core.test.jdk11.Jdk11; +import org.assertj.core.testkit.jdk11.Jdk11; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_size_Test.java b/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_size_Test.java index a0e7f51333..9bb6199584 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_size_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_size_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.data.MapEntry.entry; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import java.util.Map; diff --git a/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_values_Test.java b/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_values_Test.java index 664188c045..ba1bd8c4c3 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_values_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/map/MapAssert_values_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.map; -import org.assertj.core.test.jdk11.Jdk11; +import org.assertj.core.testkit.jdk11.Jdk11; import org.junit.jupiter.api.Test; import java.util.Map; diff --git a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_doesNotReturn_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_doesNotReturn_Test.java index 1508fcc57f..4cbf96aff5 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_doesNotReturn_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_doesNotReturn_Test.java @@ -22,7 +22,7 @@ import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.Test; class ObjectAssert_doesNotReturn_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_Function_Array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_Function_Array_Test.java index 82c9addaa4..bbe6292f97 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_Function_Array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_Function_Array_Test.java @@ -17,8 +17,8 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; import java.util.List; import java.util.function.Function; @@ -28,8 +28,8 @@ import org.assertj.core.api.NavigationMethodBaseTest; import org.assertj.core.api.ObjectAssert; import org.assertj.core.internal.Objects; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.assertj.core.util.introspection.PropertyOrFieldSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_Function_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_Function_Test.java index e5a72baa19..28faf96ed4 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_Function_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_Function_Test.java @@ -17,8 +17,8 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; import java.util.Comparator; import java.util.Map; @@ -30,8 +30,8 @@ import org.assertj.core.api.ObjectAssert; import org.assertj.core.internal.Objects; import org.assertj.core.internal.TypeComparators; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.assertj.core.util.introspection.PropertyOrFieldSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_Function_and_InstanceOfAssertFactory_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_Function_and_InstanceOfAssertFactory_Test.java index 6563c06e17..a8bd14a22d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_Function_and_InstanceOfAssertFactory_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_Function_and_InstanceOfAssertFactory_Test.java @@ -29,8 +29,8 @@ import org.assertj.core.api.AbstractStringAssert; import org.assertj.core.api.NavigationMethodBaseTest; import org.assertj.core.api.ObjectAssert; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_String_Array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_String_Array_Test.java index c2e0af5dc9..970a6589c8 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_String_Array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_String_Array_Test.java @@ -23,8 +23,8 @@ import org.assertj.core.api.AbstractAssert; import org.assertj.core.api.NavigationMethodBaseTest; import org.assertj.core.api.ObjectAssert; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.assertj.core.util.introspection.IntrospectionError; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_String_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_String_Test.java index 88b95eaa34..37969715a2 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_String_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_String_Test.java @@ -25,8 +25,8 @@ import org.assertj.core.api.AbstractAssert; import org.assertj.core.api.NavigationMethodBaseTest; import org.assertj.core.api.ObjectAssert; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.assertj.core.util.introspection.IntrospectionError; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_String_and_InstanceOfAssertFactory_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_String_and_InstanceOfAssertFactory_Test.java index 0305d81985..28db0c960a 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_String_and_InstanceOfAssertFactory_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_extracting_with_String_and_InstanceOfAssertFactory_Test.java @@ -31,8 +31,8 @@ import org.assertj.core.api.AbstractStringAssert; import org.assertj.core.api.NavigationMethodBaseTest; import org.assertj.core.api.ObjectAssert; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.assertj.core.util.introspection.IntrospectionError; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasAllNullFieldsOrPropertiesExcept_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasAllNullFieldsOrPropertiesExcept_Test.java index 9f02b454fe..ef929cf4c7 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasAllNullFieldsOrPropertiesExcept_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasAllNullFieldsOrPropertiesExcept_Test.java @@ -16,7 +16,7 @@ import org.assertj.core.api.ObjectAssert; import org.assertj.core.api.ObjectAssertBaseTest; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; /** * Tests for {@link ObjectAssert#hasAllNullFieldsOrPropertiesExcept(String...)}. diff --git a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasAllNullFieldsOrProperties_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasAllNullFieldsOrProperties_Test.java index ec9b9043e6..253546abc4 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasAllNullFieldsOrProperties_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasAllNullFieldsOrProperties_Test.java @@ -16,7 +16,7 @@ import org.assertj.core.api.ObjectAssert; import org.assertj.core.api.ObjectAssertBaseTest; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; /** * Tests for {@link ObjectAssert#hasAllNullFieldsOrProperties()}. diff --git a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasFieldOrPropertyWithValue_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasFieldOrPropertyWithValue_Test.java index aa4a8fec04..a9d139dd73 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasFieldOrPropertyWithValue_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasFieldOrPropertyWithValue_Test.java @@ -17,7 +17,7 @@ import org.assertj.core.api.ObjectAssert; import org.assertj.core.api.ObjectAssertBaseTest; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.Test; /** @@ -27,8 +27,8 @@ */ class ObjectAssert_hasFieldOrPropertyWithValue_Test extends ObjectAssertBaseTest { - public static final String FIELD_NAME = "name"; // field in org.assertj.core.test.Person - public static final String FIELD_VALUE = "Yoda"; // field value in org.assertj.core.test.Person + public static final String FIELD_NAME = "name"; // field in org.assertj.core.testkit.Person + public static final String FIELD_VALUE = "Yoda"; // field value in org.assertj.core.testkit.Person @Override protected ObjectAssert invoke_api_method() { diff --git a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasFieldOrProperty_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasFieldOrProperty_Test.java index a804522fef..01491c0d86 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasFieldOrProperty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasFieldOrProperty_Test.java @@ -16,7 +16,7 @@ import org.assertj.core.api.ObjectAssert; import org.assertj.core.api.ObjectAssertBaseTest; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; /** * Tests for {@link ObjectAssert#hasFieldOrProperty(String)}. diff --git a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasNoNullFieldsOrProperties_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasNoNullFieldsOrProperties_Test.java index ef545acfc2..7479c42c3f 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasNoNullFieldsOrProperties_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasNoNullFieldsOrProperties_Test.java @@ -19,8 +19,8 @@ import org.assertj.core.api.ObjectAssert; import org.assertj.core.api.ObjectAssertBaseTest; -import org.assertj.core.test.Jedi; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Jedi; +import org.assertj.core.testkit.Person; import org.junit.jupiter.api.Test; /** @@ -31,7 +31,7 @@ */ class ObjectAssert_hasNoNullFieldsOrProperties_Test extends ObjectAssertBaseTest { - private static final String FIELD_NAME = "color"; // field in org.assertj.core.test.Person + private static final String FIELD_NAME = "color"; // field in org.assertj.core.testkit.Person @Override protected ObjectAssert invoke_api_method() { diff --git a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasOnlyFields_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasOnlyFields_Test.java index 1f182b172f..bfbac9397f 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasOnlyFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasOnlyFields_Test.java @@ -16,7 +16,7 @@ import org.assertj.core.api.ObjectAssert; import org.assertj.core.api.ObjectAssertBaseTest; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; /** * Tests for {@link ObjectAssert#hasOnlyFieldsOrProperties(String...)}. @@ -25,7 +25,7 @@ */ class ObjectAssert_hasOnlyFields_Test extends ObjectAssertBaseTest { - public static final String FIELD_NAME = "name"; // field in org.assertj.core.test.Person + public static final String FIELD_NAME = "name"; // field in org.assertj.core.testkit.Person @Override protected ObjectAssert invoke_api_method() { diff --git a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasSameHashCodeAs_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasSameHashCodeAs_Test.java index da90a5a0cc..11e9ea194d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasSameHashCodeAs_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_hasSameHashCodeAs_Test.java @@ -16,7 +16,7 @@ import org.assertj.core.api.ObjectAssert; import org.assertj.core.api.ObjectAssertBaseTest; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; /** * Tests for {@link ObjectAssert#hasSameHashCodeAs(Object)}. diff --git a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_isEqualToComparingOnlyGivenFields_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_isEqualToComparingOnlyGivenFields_Test.java index a1795fc99c..645d2c612b 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_isEqualToComparingOnlyGivenFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_isEqualToComparingOnlyGivenFields_Test.java @@ -15,14 +15,14 @@ import static java.util.Collections.EMPTY_MAP; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.internal.TypeComparators.defaultTypeComparators; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; import static org.mockito.Mockito.verify; import java.util.Comparator; import org.assertj.core.api.ObjectAssert; import org.assertj.core.api.ObjectAssertBaseTest; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_isEqualToIgnoringGivenFields_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_isEqualToIgnoringGivenFields_Test.java index 05418934c0..f0fb7edcef 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_isEqualToIgnoringGivenFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_isEqualToIgnoringGivenFields_Test.java @@ -15,14 +15,14 @@ import static java.util.Collections.EMPTY_MAP; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.internal.TypeComparators.defaultTypeComparators; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; import static org.mockito.Mockito.verify; import java.util.Comparator; import org.assertj.core.api.ObjectAssert; import org.assertj.core.api.ObjectAssertBaseTest; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_isEqualToIgnoringNullFields_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_isEqualToIgnoringNullFields_Test.java index 7815636815..cae40d8a71 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_isEqualToIgnoringNullFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_isEqualToIgnoringNullFields_Test.java @@ -15,14 +15,14 @@ import static java.util.Collections.EMPTY_MAP; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.internal.TypeComparators.defaultTypeComparators; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; import static org.mockito.Mockito.verify; import java.util.Comparator; import org.assertj.core.api.ObjectAssert; import org.assertj.core.api.ObjectAssertBaseTest; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_isEqualsToComparingFields_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_isEqualsToComparingFields_Test.java index 84ce33d859..3857546e96 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_isEqualsToComparingFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_isEqualsToComparingFields_Test.java @@ -16,9 +16,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.internal.TypeComparators.defaultTypeComparators; import static org.assertj.core.internal.objects.SymmetricDateComparator.SYMMETRIC_DATE_COMPARATOR; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; -import static org.assertj.core.test.NeverEqualComparator.NEVER_EQUALS; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.NeverEqualComparator.NEVER_EQUALS; import static org.mockito.Mockito.verify; import java.sql.Timestamp; @@ -27,10 +27,10 @@ import org.assertj.core.api.ObjectAssert; import org.assertj.core.api.ObjectAssertBaseTest; -import org.assertj.core.test.Jedi; -import org.assertj.core.test.Patient; -import org.assertj.core.test.Person; -import org.assertj.core.test.PersonCaseInsensitiveNameComparator; +import org.assertj.core.testkit.Jedi; +import org.assertj.core.testkit.Patient; +import org.assertj.core.testkit.Person; +import org.assertj.core.testkit.PersonCaseInsensitiveNameComparator; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_returns_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_returns_Test.java index 38afaecb76..405e41a496 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_returns_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_returns_Test.java @@ -20,7 +20,7 @@ import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_usingComparator_Test.java index c4df7bf47f..362cafbee6 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_usingComparator_Test.java @@ -13,13 +13,13 @@ package org.assertj.core.api.object; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; import org.assertj.core.api.ObjectAssert; import org.assertj.core.api.ObjectAssertBaseTest; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; /** * Tests for {@link ObjectAssert#usingComparator(java.util.Comparator)} and diff --git a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_usingDefaultComparator_Test.java index 573dd76913..a7b5a18982 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object/ObjectAssert_usingDefaultComparator_Test.java @@ -13,11 +13,11 @@ package org.assertj.core.api.object; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.ObjectAssert; import org.assertj.core.api.ObjectAssertBaseTest; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; /** * Tests for {@link ObjectAssert#usingDefaultComparator()}. diff --git a/assertj-core/src/test/java/org/assertj/core/api/object2darray/Object2DArrayAssert_contains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object2darray/Object2DArrayAssert_contains_at_Index_Test.java index f0cf5bc26f..248bad33e8 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object2darray/Object2DArrayAssert_contains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object2darray/Object2DArrayAssert_contains_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.object2darray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.Object2DArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/object2darray/Object2DArrayAssert_doesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object2darray/Object2DArrayAssert_doesNotContain_at_Index_Test.java index 41bc6bd363..1cc90cba09 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object2darray/Object2DArrayAssert_doesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object2darray/Object2DArrayAssert_doesNotContain_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.object2darray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.Object2DArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/object2darray/Object2DArrayAssert_isDeepEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object2darray/Object2DArrayAssert_isDeepEqualTo_Test.java index da9d1a6f0c..89339f5e54 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object2darray/Object2DArrayAssert_isDeepEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object2darray/Object2DArrayAssert_isDeepEqualTo_Test.java @@ -23,7 +23,7 @@ import org.assertj.core.api.Object2DArrayAssert; import org.assertj.core.error.ErrorMessageFactory; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Person; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/object2darray/Object2DArrayAssert_usingCustomComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/object2darray/Object2DArrayAssert_usingCustomComparator_Test.java index 3d3cc8d35c..c4e9e375a6 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/object2darray/Object2DArrayAssert_usingCustomComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/object2darray/Object2DArrayAssert_usingCustomComparator_Test.java @@ -13,11 +13,11 @@ package org.assertj.core.api.object2darray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.Object2DArrayAssert; import org.assertj.core.api.Object2DArrayAssertBaseTest; -import org.assertj.core.test.AlwaysEqualComparator; +import org.assertj.core.testkit.AlwaysEqualComparator; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_contains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_contains_at_Index_Test.java index 6cdc8f87ca..7464d0b876 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_contains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_contains_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.objectarray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.ObjectArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_doesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_doesNotContain_at_Index_Test.java index 099dfaa60a..6ae1f50f6e 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_doesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_doesNotContain_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.objectarray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.ObjectArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_extractingResultOf_Test.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_extractingResultOf_Test.java index 9c03b5ae3e..3fcf889958 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_extractingResultOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_extractingResultOf_Test.java @@ -19,17 +19,17 @@ import static org.assertj.core.api.GroupAssertTestHelper.comparatorForElementFieldsWithTypeOf; import static org.assertj.core.api.GroupAssertTestHelper.comparatorsByTypeOf; import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; import static org.assertj.core.util.Arrays.array; import java.sql.Timestamp; import org.assertj.core.api.AbstractListAssert; import org.assertj.core.api.ObjectArrayAssert; -import org.assertj.core.test.CaseInsensitiveStringComparator; -import org.assertj.core.test.FluentJedi; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.FluentJedi; +import org.assertj.core.testkit.Name; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_extracting_Test.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_extracting_Test.java index b47ac64a21..d8861f3819 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_extracting_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_extracting_Test.java @@ -29,9 +29,9 @@ import static org.assertj.core.data.TolkienCharacter.Race.MAN; import static org.assertj.core.extractor.Extractors.byName; import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_TUPLE; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_TUPLE; import static org.assertj.core.util.Arrays.array; import java.sql.Timestamp; @@ -43,8 +43,8 @@ import org.assertj.core.api.iterable.ThrowingExtractor; import org.assertj.core.data.TolkienCharacter; import org.assertj.core.groups.Tuple; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.assertj.core.util.introspection.IntrospectionError; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOnAssertions_Test.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOnAssertions_Test.java index a1ef4f750f..0c36b2cbb0 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOnAssertions_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOnAssertions_Test.java @@ -24,8 +24,8 @@ import org.assertj.core.data.TolkienCharacter; import org.assertj.core.data.TolkienCharacterAssert; import org.assertj.core.data.TolkienCharacterAssertFactory; -import org.assertj.core.test.CaseInsensitiveStringComparator; -import org.assertj.core.test.Employee; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.Employee; import org.junit.jupiter.api.Test; class ObjectArrayAssert_filteredOnAssertions_Test extends ObjectArrayAssert_filtered_baseTest { diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOnAssertions_ThrowingConsumer_Test.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOnAssertions_ThrowingConsumer_Test.java index f9c6d15848..bbd1621b4d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOnAssertions_ThrowingConsumer_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOnAssertions_ThrowingConsumer_Test.java @@ -22,8 +22,8 @@ import org.assertj.core.api.ObjectArrayAssert; import org.assertj.core.api.ThrowingConsumer; -import org.assertj.core.test.CaseInsensitiveStringComparator; -import org.assertj.core.test.Employee; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.Employee; import org.junit.jupiter.api.Test; class ObjectArrayAssert_filteredOnAssertions_ThrowingConsumer_Test extends ObjectArrayAssert_filtered_baseTest { diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOn_condition_Test.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOn_condition_Test.java index 543ef62181..c35e8b7340 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOn_condition_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOn_condition_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.not; import org.assertj.core.api.Condition; -import org.assertj.core.test.Employee; +import org.assertj.core.testkit.Employee; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOn_function_Test.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOn_function_Test.java index e1d6028cd7..08535582a3 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOn_function_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOn_function_Test.java @@ -16,14 +16,14 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; -import static org.assertj.core.test.Name.lastNameComparator; -import static org.assertj.core.test.Name.name; +import static org.assertj.core.testkit.Name.lastNameComparator; +import static org.assertj.core.testkit.Name.name; import java.util.function.Function; import org.assertj.core.api.IterableAssert; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOn_predicate_Test.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOn_predicate_Test.java index b8dfff5ff5..ee52c8a488 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOn_predicate_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOn_predicate_Test.java @@ -17,7 +17,7 @@ import java.util.function.Predicate; -import org.assertj.core.test.Employee; +import org.assertj.core.testkit.Employee; import org.junit.jupiter.api.Test; class ObjectArrayAssert_filteredOn_predicate_Test extends ObjectArrayAssert_filtered_baseTest { diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filtered_baseTest.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filtered_baseTest.java index 3f12d826f2..d186d99718 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filtered_baseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filtered_baseTest.java @@ -16,8 +16,8 @@ import static org.assertj.core.data.TolkienCharacter.Race.HOBBIT; import org.assertj.core.data.TolkienCharacter; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.junit.jupiter.api.BeforeEach; public class ObjectArrayAssert_filtered_baseTest { diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_flatExtracting_Test.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_flatExtracting_Test.java index 635009ffae..47a27353ab 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_flatExtracting_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_flatExtracting_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.api.GroupAssertTestHelper.comparatorForElementFieldsWithTypeOf; import static org.assertj.core.api.GroupAssertTestHelper.comparatorsByTypeOf; import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import static org.assertj.core.util.Arrays.array; import java.sql.Timestamp; @@ -31,8 +31,8 @@ import org.assertj.core.api.AbstractListAssert; import org.assertj.core.api.iterable.Extractor; import org.assertj.core.api.iterable.ThrowingExtractor; -import org.assertj.core.test.AlwaysEqualComparator; -import org.assertj.core.test.CartoonCharacter; +import org.assertj.core.testkit.AlwaysEqualComparator; +import org.assertj.core.testkit.CartoonCharacter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_flatExtracting_with_String_parameter_Test.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_flatExtracting_with_String_parameter_Test.java index e22bd750af..2bc019eb04 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_flatExtracting_with_String_parameter_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_flatExtracting_with_String_parameter_Test.java @@ -18,16 +18,16 @@ import static org.assertj.core.api.GroupAssertTestHelper.comparatorForElementFieldsWithTypeOf; import static org.assertj.core.api.GroupAssertTestHelper.comparatorsByTypeOf; import static org.assertj.core.presentation.UnicodeRepresentation.UNICODE_REPRESENTATION; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import static org.assertj.core.util.Arrays.array; import java.sql.Timestamp; import org.assertj.core.api.AbstractListAssert; -import org.assertj.core.test.AlwaysEqualComparator; -import org.assertj.core.test.CartoonCharacter; +import org.assertj.core.testkit.AlwaysEqualComparator; +import org.assertj.core.testkit.CartoonCharacter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_hasOnlyOneElementSatisfying_Test.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_hasOnlyOneElementSatisfying_Test.java index 6e57582522..a33450cbd8 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_hasOnlyOneElementSatisfying_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_hasOnlyOneElementSatisfying_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import org.assertj.core.api.SoftAssertions; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.Test; class ObjectArrayAssert_hasOnlyOneElementSatisfying_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_isSortedAccordingToComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_isSortedAccordingToComparator_Test.java index 4a80ba8eb6..9e7ef45a4d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_isSortedAccordingToComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_isSortedAccordingToComparator_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.objectarray; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import static org.mockito.Mockito.verify; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingComparatorForType_Test.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingComparatorForType_Test.java index 3e6ed65fe1..497ae33b71 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingComparatorForType_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingComparatorForType_Test.java @@ -16,8 +16,8 @@ import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; -import static org.assertj.core.test.NeverEqualComparator.NEVER_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.NeverEqualComparator.NEVER_EQUALS_STRING; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.BigDecimalComparator.BIG_DECIMAL_COMPARATOR; @@ -29,7 +29,7 @@ import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.internal.ExtendedByTypesComparator; import org.assertj.core.internal.ObjectArrays; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -172,7 +172,7 @@ void should_fail_because_of_comparator_set_last() { + " [Luke the Jedi]%n" + "when comparing values using field/property by field/property comparator on all fields/properties%n" + "Comparators used:%n" - + "- for elements fields (by type): {Double -> DoubleComparator[precision=1.0E-15], Float -> FloatComparator[precision=1.0E-6], String -> org.assertj.core.test.NeverEqualComparator, Path -> lexicographic comparator (Path natural order)}%n" + + "- for elements fields (by type): {Double -> DoubleComparator[precision=1.0E-15], Float -> FloatComparator[precision=1.0E-6], String -> org.assertj.core.testkit.NeverEqualComparator, Path -> lexicographic comparator (Path natural order)}%n" + "- for elements (by type): {Double -> DoubleComparator[precision=1.0E-15], Float -> FloatComparator[precision=1.0E-6], String -> AlwaysEqualComparator, Path -> lexicographic comparator (Path natural order)}")); } } diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingComparator_Test.java index 7388622716..356dff7488 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.objectarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingDefaultComparator_Test.java index dd2735f642..eb304f52f5 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingDefaultComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.objectarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingDefaultElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingDefaultElementComparator_Test.java index b3e356f12f..187664e829 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingDefaultElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingDefaultElementComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.objectarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.ObjectArrayAssert; import org.assertj.core.api.ObjectArrayAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingElementComparatorIgnoringFields_Test.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingElementComparatorIgnoringFields_Test.java index 607fec8226..a5a9db9cdd 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingElementComparatorIgnoringFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingElementComparatorIgnoringFields_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.objectarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; import static org.assertj.core.util.Arrays.array; import java.util.Comparator; @@ -24,7 +24,7 @@ import org.assertj.core.internal.ExtendedByTypesComparator; import org.assertj.core.internal.IgnoringFieldsComparator; import org.assertj.core.internal.ObjectArrays; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingElementComparatorOnFields_Test.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingElementComparatorOnFields_Test.java index 7dad85e656..e955f95b9f 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingElementComparatorOnFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingElementComparatorOnFields_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.objectarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; import static org.assertj.core.util.Arrays.array; import java.util.Comparator; @@ -24,7 +24,7 @@ import org.assertj.core.internal.ExtendedByTypesComparator; import org.assertj.core.internal.ObjectArrays; import org.assertj.core.internal.OnFieldsComparator; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingElementComparator_Test.java index b0cdd53013..188612eb1b 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingElementComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.objectarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingFieldByFieldElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingFieldByFieldElementComparator_Test.java index f6f046df85..e29b3a58e5 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingFieldByFieldElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingFieldByFieldElementComparator_Test.java @@ -15,8 +15,8 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.Lists.newArrayList; @@ -28,7 +28,7 @@ import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.internal.ObjectArrayElementComparisonStrategy; import org.assertj.core.internal.ObjectArrays; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingRecursiveFieldByFieldElementComparatorIgnoringFields_Test.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingRecursiveFieldByFieldElementComparatorIgnoringFields_Test.java index 66dc7df869..a30501b02c 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingRecursiveFieldByFieldElementComparatorIgnoringFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingRecursiveFieldByFieldElementComparatorIgnoringFields_Test.java @@ -22,8 +22,8 @@ import org.assertj.core.internal.ConfigurableRecursiveFieldByFieldComparator; import org.assertj.core.internal.ObjectArrayElementComparisonStrategy; import org.assertj.core.internal.ObjectArrays; -import org.assertj.core.test.Name; -import org.assertj.core.test.Player; +import org.assertj.core.testkit.Name; +import org.assertj.core.testkit.Player; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingRecursiveFieldByFieldElementComparatorOnFields_Test.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingRecursiveFieldByFieldElementComparatorOnFields_Test.java index beb8962213..2312af7a8c 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingRecursiveFieldByFieldElementComparatorOnFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingRecursiveFieldByFieldElementComparatorOnFields_Test.java @@ -22,8 +22,8 @@ import org.assertj.core.internal.ConfigurableRecursiveFieldByFieldComparator; import org.assertj.core.internal.ObjectArrayElementComparisonStrategy; import org.assertj.core.internal.ObjectArrays; -import org.assertj.core.test.Name; -import org.assertj.core.test.Player; +import org.assertj.core.testkit.Name; +import org.assertj.core.testkit.Player; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingRecursiveFieldByFieldElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingRecursiveFieldByFieldElementComparator_Test.java index 0ebea899dc..d80bd2d3a4 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingRecursiveFieldByFieldElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_usingRecursiveFieldByFieldElementComparator_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.configuration.ConfigurationProvider.CONFIGURATION_PROVIDER; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.ObjectArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/offsetdatetime/OffsetDateTimeAssert_isEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/api/offsetdatetime/OffsetDateTimeAssert_isEqualTo_Test.java index 329714654d..ba64ca0265 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/offsetdatetime/OffsetDateTimeAssert_isEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/offsetdatetime/OffsetDateTimeAssert_isEqualTo_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.api.BDDAssertions.thenIllegalArgumentException; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/api/offsettime/OffsetTimeAssert_isEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/api/offsettime/OffsetTimeAssert_isEqualTo_Test.java index eadfc24366..4e1709a4e3 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/offsettime/OffsetTimeAssert_isEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/offsettime/OffsetTimeAssert_isEqualTo_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import java.time.OffsetTime; diff --git a/assertj-core/src/test/java/org/assertj/core/api/optional/OptionalAssert_hasValueSatisfying_Test.java b/assertj-core/src/test/java/org/assertj/core/api/optional/OptionalAssert_hasValueSatisfying_Test.java index 7a1d593963..40109cef17 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/optional/OptionalAssert_hasValueSatisfying_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/optional/OptionalAssert_hasValueSatisfying_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.OptionalShouldBePresent.shouldBePresent; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/assertion/RecursiveAssertionAssert_allFieldsSatisfy_Test.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/assertion/RecursiveAssertionAssert_allFieldsSatisfy_Test.java index 4902adac1c..354f01bbc2 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/recursive/assertion/RecursiveAssertionAssert_allFieldsSatisfy_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/recursive/assertion/RecursiveAssertionAssert_allFieldsSatisfy_Test.java @@ -24,7 +24,7 @@ import java.util.Optional; import java.util.function.Predicate; -import org.assertj.core.test.jdk11.Jdk11; +import org.assertj.core.testkit.jdk11.Jdk11; import org.junit.jupiter.api.Test; class RecursiveAssertionAssert_allFieldsSatisfy_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/assertion/RecursiveAssertionDriver_MapPolicyTest.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/assertion/RecursiveAssertionDriver_MapPolicyTest.java index 8fb59eed3f..60652a79cd 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/recursive/assertion/RecursiveAssertionDriver_MapPolicyTest.java +++ b/assertj-core/src/test/java/org/assertj/core/api/recursive/assertion/RecursiveAssertionDriver_MapPolicyTest.java @@ -22,7 +22,7 @@ import java.util.Map; import org.assertj.core.api.recursive.comparison.FieldLocation; -import org.assertj.core.test.jdk11.Jdk11; +import org.assertj.core.testkit.jdk11.Jdk11; import org.junit.jupiter.api.Test; class RecursiveAssertionDriver_MapPolicyTest extends AbstractRecursiveAssertionDriverTestBase { diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/ComparisonDifference_multiLineDescription_Test.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/ComparisonDifference_multiLineDescription_Test.java index fdb9315262..b49bca8fe7 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/ComparisonDifference_multiLineDescription_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/ComparisonDifference_multiLineDescription_Test.java @@ -26,7 +26,7 @@ import java.util.TreeMap; import java.util.stream.Stream; -import org.assertj.core.test.Maps; +import org.assertj.core.testkit.Maps; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/DualValue_mapValues_Test.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/DualValue_mapValues_Test.java index a0e4cf197f..6f285a792a 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/DualValue_mapValues_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/DualValue_mapValues_Test.java @@ -15,8 +15,8 @@ import static java.util.Collections.singletonMap; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.Maps.treeMapOf; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.Maps.treeMapOf; import static org.assertj.core.util.Lists.list; import java.util.List; diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/FieldComparators_Test.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/FieldComparators_Test.java index 9cdb30d945..2bcd156234 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/FieldComparators_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/FieldComparators_Test.java @@ -14,8 +14,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.AlwaysDifferentComparator.ALWAY_DIFFERENT; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS; +import static org.assertj.core.testkit.AlwaysDifferentComparator.ALWAY_DIFFERENT; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS; import static org.assertj.core.util.Arrays.array; import org.junit.jupiter.api.BeforeEach; diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/PersonData.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/PersonData.java index 0e0f9f0b00..92dc6ffd2c 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/PersonData.java +++ b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/PersonData.java @@ -13,7 +13,7 @@ package org.assertj.core.api.recursive.comparison; import org.assertj.core.internal.objects.data.PersonDto; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Person; public interface PersonData { diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_fluent_API_Test.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_fluent_API_Test.java index cc68061f56..30865ae237 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_fluent_API_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_fluent_API_Test.java @@ -17,12 +17,12 @@ import static org.assertj.core.api.Assertions.entry; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.internal.TypeComparators.defaultTypeComparators; -import static org.assertj.core.test.AlwaysDifferentComparator.alwaysDifferent; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; -import static org.assertj.core.test.BiPredicates.DOUBLE_EQUALS; -import static org.assertj.core.test.BiPredicates.STRING_EQUALS; +import static org.assertj.core.testkit.AlwaysDifferentComparator.alwaysDifferent; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.BiPredicates.DOUBLE_EQUALS; +import static org.assertj.core.testkit.BiPredicates.STRING_EQUALS; import java.sql.Timestamp; import java.util.Comparator; @@ -33,8 +33,8 @@ import java.util.regex.Pattern; import org.assertj.core.groups.Tuple; -import org.assertj.core.test.AlwaysDifferentComparator; -import org.assertj.core.test.AlwaysEqualComparator; +import org.assertj.core.testkit.AlwaysDifferentComparator; +import org.assertj.core.testkit.AlwaysEqualComparator; import org.junit.jupiter.api.Test; class RecursiveComparisonAssert_fluent_API_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_for_iterables_Test.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_for_iterables_Test.java index cdd6069424..db4d54ecdb 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_for_iterables_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_for_iterables_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; import static org.assertj.core.util.Sets.newLinkedHashSet; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_for_maps_Test.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_for_maps_Test.java index 26738887d8..2b1175661b 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_for_maps_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_for_maps_Test.java @@ -16,13 +16,13 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import java.util.Map; import org.assertj.core.internal.objects.data.PersonDto; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Person; import org.junit.jupiter.api.Test; import com.google.common.collect.ImmutableMap; diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_for_object_arrays_Test.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_for_object_arrays_Test.java index 225c9bc66d..90d3efd3a0 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_for_object_arrays_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_for_object_arrays_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_Test.java index 5031b56e2f..bd34eda701 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_Test.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.recursive.comparison.ColorWithCode.RED; import static org.assertj.core.error.ShouldBeEqual.shouldBeEqual; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.Maps.mapOf; import static org.assertj.core.util.Lists.list; import static org.assertj.core.util.Maps.newHashMap; import static org.junit.jupiter.params.provider.Arguments.arguments; diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_ignoringFieldsOfTypesMatchingRegexes_Test.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_ignoringFieldsOfTypesMatchingRegexes_Test.java index c6845937c3..d021266a53 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_ignoringFieldsOfTypesMatchingRegexes_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_ignoringFieldsOfTypesMatchingRegexes_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.ObjectArrays.arrayOf; +import static org.assertj.core.testkit.ObjectArrays.arrayOf; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.Lists.list; import static org.assertj.core.util.Sets.newHashSet; diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_withComparatorsForFieldMatchingRegexes_Test.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_withComparatorsForFieldMatchingRegexes_Test.java index 16f10f27b0..56b5e38d9a 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_withComparatorsForFieldMatchingRegexes_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_withComparatorsForFieldMatchingRegexes_Test.java @@ -14,10 +14,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.BiPredicates.ALWAYS_DIFFERENT; -import static org.assertj.core.test.BiPredicates.ALWAYS_EQUALS; -import static org.assertj.core.test.BiPredicates.STRING_EQUALS; -import static org.assertj.core.test.NeverEqualComparator.NEVER_EQUALS; +import static org.assertj.core.testkit.BiPredicates.ALWAYS_DIFFERENT; +import static org.assertj.core.testkit.BiPredicates.ALWAYS_EQUALS; +import static org.assertj.core.testkit.BiPredicates.STRING_EQUALS; +import static org.assertj.core.testkit.NeverEqualComparator.NEVER_EQUALS; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.junit.jupiter.params.provider.Arguments.arguments; @@ -31,7 +31,7 @@ import org.assertj.core.api.RecursiveComparisonAssert_isEqualTo_BaseTest; import org.assertj.core.internal.objects.data.Giant; import org.assertj.core.internal.objects.data.Home; -import org.assertj.core.test.Patient; +import org.assertj.core.testkit.Patient; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_withFieldComparators_Test.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_withFieldComparators_Test.java index 6a5bb7a013..77cefe9fa1 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_withFieldComparators_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_withFieldComparators_Test.java @@ -15,11 +15,11 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.internal.objects.SymmetricDateComparator.SYMMETRIC_DATE_COMPARATOR; -import static org.assertj.core.test.AlwaysDifferentComparator.alwaysDifferent; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; -import static org.assertj.core.test.NeverEqualComparator.NEVER_EQUALS; +import static org.assertj.core.testkit.AlwaysDifferentComparator.alwaysDifferent; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.NeverEqualComparator.NEVER_EQUALS; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.junit.jupiter.params.provider.Arguments.arguments; @@ -36,8 +36,8 @@ import org.assertj.core.internal.objects.data.AlwaysEqualPerson; import org.assertj.core.internal.objects.data.Giant; import org.assertj.core.internal.objects.data.Person; -import org.assertj.core.test.CaseInsensitiveStringComparator; -import org.assertj.core.test.Patient; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.Patient; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_withTypeComparators_Test.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_withTypeComparators_Test.java index e89248cabd..b040fddcc2 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_withTypeComparators_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_withTypeComparators_Test.java @@ -16,10 +16,10 @@ import static org.assertj.core.api.Assertions.entry; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.internal.objects.SymmetricDateComparator.SYMMETRIC_DATE_COMPARATOR; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.NeverEqualComparator.NEVER_EQUALS; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.NeverEqualComparator.NEVER_EQUALS; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.junit.jupiter.params.provider.Arguments.arguments; @@ -37,10 +37,10 @@ import org.assertj.core.internal.objects.data.AlwaysEqualPerson; import org.assertj.core.internal.objects.data.Giant; import org.assertj.core.internal.objects.data.Person; -import org.assertj.core.test.AlwaysDifferentComparator; -import org.assertj.core.test.AlwaysEqualComparator; -import org.assertj.core.test.CaseInsensitiveStringComparator; -import org.assertj.core.test.Patient; +import org.assertj.core.testkit.AlwaysDifferentComparator; +import org.assertj.core.testkit.AlwaysEqualComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.Patient; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -192,7 +192,7 @@ void should_use_custom_comparator_over_reference_comparison() { Timestamp.class) .isEqualTo(expected)); // THEN - then(assertionError).hasMessageContaining("- java.sql.Timestamp -> org.assertj.core.test.NeverEqualComparator"); + then(assertionError).hasMessageContaining("- java.sql.Timestamp -> org.assertj.core.testkit.NeverEqualComparator"); } @Test diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_with_maps_Test.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_with_maps_Test.java index 1951cdf461..aa9018ca64 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_with_maps_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_with_maps_Test.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import java.util.LinkedHashMap; diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isNotEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isNotEqualTo_Test.java index c8cc6ce9c8..4865719507 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isNotEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isNotEqualTo_Test.java @@ -14,12 +14,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.recursive.comparison.Color.GREEN; -import static org.assertj.core.test.NeverEqualComparator.NEVER_EQUALS_STRING; +import static org.assertj.core.testkit.NeverEqualComparator.NEVER_EQUALS_STRING; import org.assertj.core.api.RecursiveComparisonAssert_isNotEqualTo_BaseTest; import org.assertj.core.internal.objects.data.Person; -import org.assertj.core.test.CartoonCharacter; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.CartoonCharacter; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_builder_Test.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_builder_Test.java index a400afdc1c..c7b388c60a 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_builder_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_builder_Test.java @@ -14,8 +14,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; -import static org.assertj.core.test.BiPredicates.STRING_EQUALS; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.BiPredicates.STRING_EQUALS; import java.util.Comparator; import java.util.Set; @@ -24,7 +24,7 @@ import org.apache.commons.lang3.RandomUtils; import org.assertj.core.api.recursive.comparison.RecursiveComparisonConfiguration.Builder; -import org.assertj.core.test.AlwaysEqualComparator; +import org.assertj.core.testkit.AlwaysEqualComparator; import org.junit.jupiter.api.Test; class RecursiveComparisonConfiguration_builder_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_comparatorByType_Test.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_comparatorByType_Test.java index 227db97324..76a376785b 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_comparatorByType_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_comparatorByType_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.internal.TypeComparators.defaultTypeComparators; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS; import java.util.Comparator; import java.util.List; diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_fieldComparators_Test.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_fieldComparators_Test.java index 5a0f5fee2e..915dda4b5b 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_fieldComparators_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_fieldComparators_Test.java @@ -15,9 +15,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.Assumptions.assumeThat; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_TUPLE; -import static org.assertj.core.test.BiPredicates.DOUBLE_EQUALS; -import static org.assertj.core.test.BiPredicates.STRING_EQUALS; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_TUPLE; +import static org.assertj.core.testkit.BiPredicates.DOUBLE_EQUALS; +import static org.assertj.core.testkit.BiPredicates.STRING_EQUALS; import java.util.Comparator; import java.util.function.BiPredicate; diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_getActualNonIgnoreFields_Test.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_getActualNonIgnoreFields_Test.java index 7554404bda..73d9f0234e 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_getActualNonIgnoreFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_getActualNonIgnoreFields_Test.java @@ -23,7 +23,7 @@ import com.google.common.base.Stopwatch; import org.assertj.core.internal.objects.data.Person; import org.assertj.core.internal.objects.data.PersonDtoWithPersonNeighbour; -import org.assertj.core.test.Employee; +import org.assertj.core.testkit.Employee; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_hasCustomComparators_Test.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_hasCustomComparators_Test.java index 07cc7a1d27..ff750fc828 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_hasCustomComparators_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_hasCustomComparators_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.recursive.comparison; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS; import java.util.function.BiPredicate; diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_multiLineDescription_Test.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_multiLineDescription_Test.java index 7c9e608ad4..d12efd3a83 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_multiLineDescription_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_multiLineDescription_Test.java @@ -15,17 +15,17 @@ import static java.lang.String.format; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.presentation.StandardRepresentation.STANDARD_REPRESENTATION; -import static org.assertj.core.test.AlwaysDifferentComparator.alwaysDifferent; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_TUPLE; -import static org.assertj.core.test.BiPredicates.DOUBLE_EQUALS; -import static org.assertj.core.test.BiPredicates.STRING_EQUALS; +import static org.assertj.core.testkit.AlwaysDifferentComparator.alwaysDifferent; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_TUPLE; +import static org.assertj.core.testkit.BiPredicates.DOUBLE_EQUALS; +import static org.assertj.core.testkit.BiPredicates.STRING_EQUALS; import java.time.ZonedDateTime; import java.util.Comparator; import java.util.UUID; import org.assertj.core.groups.Tuple; -import org.assertj.core.test.AlwaysEqualComparator; +import org.assertj.core.testkit.AlwaysEqualComparator; import org.assertj.core.util.AbsValueComparator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_shouldNotEvaluate_Test.java b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_shouldNotEvaluate_Test.java index be3208c00d..4ad8537df3 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_shouldNotEvaluate_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonConfiguration_shouldNotEvaluate_Test.java @@ -30,8 +30,8 @@ import java.util.regex.Pattern; import java.util.stream.Stream; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Person; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/short2darray/Short2DArrayAssert_contains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/short2darray/Short2DArrayAssert_contains_at_Index_Test.java index 6d0bc33609..c799f57fde 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/short2darray/Short2DArrayAssert_contains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/short2darray/Short2DArrayAssert_contains_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.short2darray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.Short2DArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/short2darray/Short2DArrayAssert_doesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/short2darray/Short2DArrayAssert_doesNotContain_at_Index_Test.java index 8c91db8760..661cd70489 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/short2darray/Short2DArrayAssert_doesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/short2darray/Short2DArrayAssert_doesNotContain_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.short2darray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.Short2DArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/short2darray/Short2DArrayAssert_usingCustomComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/short2darray/Short2DArrayAssert_usingCustomComparator_Test.java index 9b334f611b..b3c5163f8d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/short2darray/Short2DArrayAssert_usingCustomComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/short2darray/Short2DArrayAssert_usingCustomComparator_Test.java @@ -13,11 +13,11 @@ package org.assertj.core.api.short2darray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.Short2DArrayAssert; import org.assertj.core.api.Short2DArrayAssertBaseTest; -import org.assertj.core.test.AlwaysEqualComparator; +import org.assertj.core.testkit.AlwaysEqualComparator; import org.junit.jupiter.api.Test; class Short2DArrayAssert_usingCustomComparator_Test extends Short2DArrayAssertBaseTest { diff --git a/assertj-core/src/test/java/org/assertj/core/api/short_/ShortAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/short_/ShortAssert_usingComparator_Test.java index 2c695c1d5a..e03f267835 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/short_/ShortAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/short_/ShortAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.short_; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/short_/ShortAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/short_/ShortAssert_usingDefaultComparator_Test.java index 6930a29b1d..1413a46b49 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/short_/ShortAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/short_/ShortAssert_usingDefaultComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.short_; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.ShortAssert; import org.assertj.core.api.ShortAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsAnyOf_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsAnyOf_Test.java index e523e805be..b50525e251 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsAnyOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsAnyOf_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.shortarray; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsAnyOf_with_Integer_Argument_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsAnyOf_with_Integer_Argument_Test.java index 3cbd3fda2c..a6f4579795 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsAnyOf_with_Integer_Argument_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsAnyOf_with_Integer_Argument_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.shortarray; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AbstractShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsAnyOf_with_Short_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsAnyOf_with_Short_array_Test.java index 25bf07c710..3578d1fd13 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsAnyOf_with_Short_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsAnyOf_with_Short_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsExactlyInAnyOrder_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsExactlyInAnyOrder_Test.java index b6bbdc3b01..7a117da9b2 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsExactlyInAnyOrder_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsExactlyInAnyOrder_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.shortarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsExactlyInAnyOrder_with_Integer_Argument_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsExactlyInAnyOrder_with_Integer_Argument_Test.java index 4522de3d00..316562bef6 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsExactlyInAnyOrder_with_Integer_Argument_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsExactlyInAnyOrder_with_Integer_Argument_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.shortarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AbstractShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsExactlyInAnyOrder_with_Short_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsExactlyInAnyOrder_with_Short_array_Test.java index 0bcdf9634c..fc1beb7a51 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsExactlyInAnyOrder_with_Short_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsExactlyInAnyOrder_with_Short_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsExactly_Test.java index 08a2909dfa..463d4094c1 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsExactly_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.shortarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsExactly_with_Integer_Argument_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsExactly_with_Integer_Argument_Test.java index 4b79fe1974..6f3826521f 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsExactly_with_Integer_Argument_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsExactly_with_Integer_Argument_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.shortarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AbstractShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsExactly_with_Short_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsExactly_with_Short_array_Test.java index 1255a2a963..3dbdc884fb 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsExactly_with_Short_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsExactly_with_Short_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsOnlyOnce_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsOnlyOnce_Test.java index e7c43a5280..aa27439b9a 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsOnlyOnce_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsOnlyOnce_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.shortarray; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsOnlyOnce_with_Integer_Argument_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsOnlyOnce_with_Integer_Argument_Test.java index 515262ea40..9f4cfce979 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsOnlyOnce_with_Integer_Argument_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsOnlyOnce_with_Integer_Argument_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.shortarray; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AbstractShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsOnlyOnce_with_Short_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsOnlyOnce_with_Short_array_Test.java index fe12f18e1c..22282518d1 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsOnlyOnce_with_Short_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsOnlyOnce_with_Short_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsOnly_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsOnly_Test.java index 11730b272d..f5cbdc2f88 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsOnly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsOnly_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.shortarray; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsOnly_with_Integer_Argument_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsOnly_with_Integer_Argument_Test.java index a21410dda1..2fb9fac732 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsOnly_with_Integer_Argument_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsOnly_with_Integer_Argument_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.shortarray; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AbstractShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsOnly_with_Short_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsOnly_with_Short_array_Test.java index e692faf9ee..c62c547a5c 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsOnly_with_Short_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsOnly_with_Short_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsSequence_Test.java index a26ebec914..4ea0b9edd0 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsSequence_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.shortarray; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsSequence_with_Integer_Argument_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsSequence_with_Integer_Argument_Test.java index 2238ae26d2..5a763dc912 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsSequence_with_Integer_Argument_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsSequence_with_Integer_Argument_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.shortarray; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AbstractShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsSequence_with_Short_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsSequence_with_Short_array_Test.java index 4dc21dfac1..97d4d18613 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsSequence_with_Short_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsSequence_with_Short_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsSubsequence_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsSubsequence_Test.java index fa00e28e88..d1ec57f0dd 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsSubsequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsSubsequence_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.shortarray; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsSubsequence_with_Integer_Argument_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsSubsequence_with_Integer_Argument_Test.java index 4af0ecaf7b..efca26b83b 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsSubsequence_with_Integer_Argument_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsSubsequence_with_Integer_Argument_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.shortarray; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AbstractShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsSubsequence_with_Short_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsSubsequence_with_Short_array_Test.java index 0551d63ce7..672d68d6b2 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsSubsequence_with_Short_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_containsSubsequence_with_Short_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_contains_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_contains_Test.java index 93d14ae44e..72b798e9c4 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_contains_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_contains_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.shortarray; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_contains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_contains_at_Index_Test.java index 4531a36f0c..68b76ea3ab 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_contains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_contains_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.shortarray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_contains_at_Index_with_Integer_Argument_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_contains_at_Index_with_Integer_Argument_Test.java index 899f90c0c6..828184b200 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_contains_at_Index_with_Integer_Argument_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_contains_at_Index_with_Integer_Argument_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.shortarray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_contains_with_Integer_Argument_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_contains_with_Integer_Argument_Test.java index 664949738d..19a4444c5e 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_contains_with_Integer_Argument_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_contains_with_Integer_Argument_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.shortarray; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AbstractShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_contains_with_Short_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_contains_with_Short_array_Test.java index cb9c9c57ed..37da62408f 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_contains_with_Short_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_contains_with_Short_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_doesNotContain_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_doesNotContain_Test.java index cbcbb16527..0726ffd7c3 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_doesNotContain_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_doesNotContain_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.shortarray; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_doesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_doesNotContain_at_Index_Test.java index d9e21ae41a..0989bd5a39 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_doesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_doesNotContain_at_Index_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.shortarray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_doesNotContain_at_Index_with_Integer_Argument_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_doesNotContain_at_Index_with_Integer_Argument_Test.java index cef534662f..baca46960c 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_doesNotContain_at_Index_with_Integer_Argument_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_doesNotContain_at_Index_with_Integer_Argument_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.shortarray; -import static org.assertj.core.test.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someIndex; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_doesNotContain_with_Integer_Argument_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_doesNotContain_with_Integer_Argument_Test.java index 6e2594fa5d..e6b127f79d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_doesNotContain_with_Integer_Argument_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_doesNotContain_with_Integer_Argument_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.shortarray; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AbstractShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_doesNotContain_with_Short_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_doesNotContain_with_Short_array_Test.java index e0ea4fd0a0..638f146573 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_doesNotContain_with_Short_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_doesNotContain_with_Short_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_endsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_endsWith_Test.java index dc6f215379..779856bab8 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_endsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_endsWith_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.shortarray; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_endsWith_with_Integer_Argument_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_endsWith_with_Integer_Argument_Test.java index 3a2d28ea43..88e4445141 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_endsWith_with_Integer_Argument_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_endsWith_with_Integer_Argument_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.shortarray; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AbstractShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_endsWith_with_Short_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_endsWith_with_Short_array_Test.java index 3e4f9ffcce..58910c2b79 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_endsWith_with_Short_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_endsWith_with_Short_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_isSortedAccordingToComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_isSortedAccordingToComparator_Test.java index 3ae34f18ff..68ee039da3 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_isSortedAccordingToComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_isSortedAccordingToComparator_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.shortarray; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import static org.mockito.Mockito.verify; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_startsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_startsWith_Test.java index c5120c6eca..32e295761a 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_startsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_startsWith_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.shortarray; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_startsWith_with_Integer_Argument_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_startsWith_with_Integer_Argument_Test.java index 95d5119b93..58e4d3db85 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_startsWith_with_Integer_Argument_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_startsWith_with_Integer_Argument_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.api.shortarray; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.AbstractShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_startsWith_with_Short_array_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_startsWith_with_Short_array_Test.java index fbcda6a24c..bae9c4f5f2 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_startsWith_with_Short_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_startsWith_with_Short_array_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.verify; import org.assertj.core.api.ShortArrayAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_usingComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_usingComparator_Test.java index 402f815815..59501122dd 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_usingComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_usingComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.shortarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_usingDefaultComparator_Test.java index 42d9848baf..3f5b7051fe 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_usingDefaultComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.shortarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.ShortArrayAssert; import org.assertj.core.api.ShortArrayAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_usingDefaultElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_usingDefaultElementComparator_Test.java index f7b2413209..45e2bf18cd 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_usingDefaultElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_usingDefaultElementComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.shortarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import org.assertj.core.api.ShortArrayAssert; import org.assertj.core.api.ShortArrayAssertBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_usingElementComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_usingElementComparator_Test.java index 692bfae64b..114c47c341 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_usingElementComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/shortarray/ShortArrayAssert_usingElementComparator_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.api.shortarray; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.alwaysEqual; +import static org.assertj.core.testkit.AlwaysEqualComparator.alwaysEqual; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/api/string_/StringAssert_usingCustomComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/string_/StringAssert_usingCustomComparator_Test.java index 29fd6d6b2d..c66878e72f 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/string_/StringAssert_usingCustomComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/string_/StringAssert_usingCustomComparator_Test.java @@ -16,7 +16,7 @@ import org.assertj.core.api.StringAssert; import org.assertj.core.api.StringAssertBaseTest; -import org.assertj.core.test.CaseInsensitiveCharSequenceComparator; +import org.assertj.core.testkit.CaseInsensitiveCharSequenceComparator; class StringAssert_usingCustomComparator_Test extends StringAssertBaseTest { diff --git a/assertj-core/src/test/java/org/assertj/core/api/string_/StringAssert_usingDefaultComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/api/string_/StringAssert_usingDefaultComparator_Test.java index 44f8221efc..74a85ff36a 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/string_/StringAssert_usingDefaultComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/string_/StringAssert_usingDefaultComparator_Test.java @@ -19,7 +19,7 @@ import org.assertj.core.internal.Comparables; import org.assertj.core.internal.Objects; import org.assertj.core.internal.Strings; -import org.assertj.core.test.CaseInsensitiveCharSequenceComparator; +import org.assertj.core.testkit.CaseInsensitiveCharSequenceComparator; import org.junit.jupiter.api.BeforeEach; class StringAssert_usingDefaultComparator_Test extends StringAssertBaseTest { diff --git a/assertj-core/src/test/java/org/assertj/core/api/throwable/ThrowableAssert_built_from_lambda_Test.java b/assertj-core/src/test/java/org/assertj/core/api/throwable/ThrowableAssert_built_from_lambda_Test.java index db66eeb290..42155717b5 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/throwable/ThrowableAssert_built_from_lambda_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/throwable/ThrowableAssert_built_from_lambda_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.Test; class ThrowableAssert_built_from_lambda_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/api/yearmonth/YearMonthAssert_isEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/api/yearmonth/YearMonthAssert_isEqualTo_Test.java index 325e08daef..19ec0f778d 100644 --- a/assertj-core/src/test/java/org/assertj/core/api/yearmonth/YearMonthAssert_isEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/api/yearmonth/YearMonthAssert_isEqualTo_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import java.time.YearMonth; diff --git a/assertj-core/src/test/java/org/assertj/core/condition/MatchPredicateTest.java b/assertj-core/src/test/java/org/assertj/core/condition/MatchPredicateTest.java index d941f966a6..22bfb3993c 100644 --- a/assertj-core/src/test/java/org/assertj/core/condition/MatchPredicateTest.java +++ b/assertj-core/src/test/java/org/assertj/core/condition/MatchPredicateTest.java @@ -16,7 +16,7 @@ import static org.assertj.core.internal.ErrorMessages.predicateIsNull; import org.assertj.core.api.WithAssertions; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/configuration/Configuration_apply_Test.java b/assertj-core/src/test/java/org/assertj/core/configuration/Configuration_apply_Test.java index 4079d82bb1..edf3959161 100644 --- a/assertj-core/src/test/java/org/assertj/core/configuration/Configuration_apply_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/configuration/Configuration_apply_Test.java @@ -21,7 +21,7 @@ import org.assertj.core.api.AssumptionExceptionFactory; import org.assertj.core.internal.Failures; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.MutatesGlobalConfiguration; +import org.assertj.core.testkit.MutatesGlobalConfiguration; import org.assertj.core.util.introspection.FieldSupport; import org.assertj.core.util.introspection.Introspection; import org.junit.jupiter.api.AfterEach; diff --git a/assertj-core/src/test/java/org/assertj/core/configuration/Configuration_describe_Test.java b/assertj-core/src/test/java/org/assertj/core/configuration/Configuration_describe_Test.java index 79870334e2..bde7971544 100644 --- a/assertj-core/src/test/java/org/assertj/core/configuration/Configuration_describe_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/configuration/Configuration_describe_Test.java @@ -18,7 +18,7 @@ import java.util.function.Consumer; import org.assertj.core.description.Description; -import org.assertj.core.test.MutatesGlobalConfiguration; +import org.assertj.core.testkit.MutatesGlobalConfiguration; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/description/TextDescription_equals_hashCode_Test.java b/assertj-core/src/test/java/org/assertj/core/description/TextDescription_equals_hashCode_Test.java index 4fb9f370f2..889dc26cfa 100644 --- a/assertj-core/src/test/java/org/assertj/core/description/TextDescription_equals_hashCode_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/description/TextDescription_equals_hashCode_Test.java @@ -13,10 +13,10 @@ package org.assertj.core.description; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.EqualsHashCodeContractAssert.assertEqualsIsReflexive; -import static org.assertj.core.test.EqualsHashCodeContractAssert.assertEqualsIsSymmetric; -import static org.assertj.core.test.EqualsHashCodeContractAssert.assertEqualsIsTransitive; -import static org.assertj.core.test.EqualsHashCodeContractAssert.assertMaintainsEqualsAndHashCodeContract; +import static org.assertj.core.testkit.EqualsHashCodeContractAssert.assertEqualsIsReflexive; +import static org.assertj.core.testkit.EqualsHashCodeContractAssert.assertEqualsIsSymmetric; +import static org.assertj.core.testkit.EqualsHashCodeContractAssert.assertEqualsIsTransitive; +import static org.assertj.core.testkit.EqualsHashCodeContractAssert.assertMaintainsEqualsAndHashCodeContract; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/error/BasicErrorMessageFactory_equals_hashCode_Test.java b/assertj-core/src/test/java/org/assertj/core/error/BasicErrorMessageFactory_equals_hashCode_Test.java index cf82aebe9b..61aff6140a 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/BasicErrorMessageFactory_equals_hashCode_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/BasicErrorMessageFactory_equals_hashCode_Test.java @@ -13,10 +13,10 @@ package org.assertj.core.error; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.EqualsHashCodeContractAssert.assertEqualsIsReflexive; -import static org.assertj.core.test.EqualsHashCodeContractAssert.assertEqualsIsSymmetric; -import static org.assertj.core.test.EqualsHashCodeContractAssert.assertEqualsIsTransitive; -import static org.assertj.core.test.EqualsHashCodeContractAssert.assertMaintainsEqualsAndHashCodeContract; +import static org.assertj.core.testkit.EqualsHashCodeContractAssert.assertEqualsIsReflexive; +import static org.assertj.core.testkit.EqualsHashCodeContractAssert.assertEqualsIsSymmetric; +import static org.assertj.core.testkit.EqualsHashCodeContractAssert.assertEqualsIsTransitive; +import static org.assertj.core.testkit.EqualsHashCodeContractAssert.assertMaintainsEqualsAndHashCodeContract; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ElementsShouldSatisfy_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ElementsShouldSatisfy_create_Test.java index 00daa9ba6d..1fde420653 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ElementsShouldSatisfy_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ElementsShouldSatisfy_create_Test.java @@ -19,7 +19,7 @@ import static org.assertj.core.error.ElementsShouldSatisfy.elementsShouldSatisfyAny; import static org.assertj.core.error.ElementsShouldSatisfy.elementsShouldSatisfyExactly; import static org.assertj.core.error.ElementsShouldSatisfy.unsatisfiedRequirement; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Lists.list; import java.util.List; diff --git a/assertj-core/src/test/java/org/assertj/core/error/GroupTypeDescription_getGroupTypeDescription_Test.java b/assertj-core/src/test/java/org/assertj/core/error/GroupTypeDescription_getGroupTypeDescription_Test.java index 355b1ea910..6496a08247 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/GroupTypeDescription_getGroupTypeDescription_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/GroupTypeDescription_getGroupTypeDescription_Test.java @@ -15,14 +15,14 @@ import static org.assertj.core.api.Assertions.entry; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.GroupTypeDescription.getGroupTypeDescription; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import static org.assertj.core.util.Lists.list; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.junit.jupiter.params.provider.Arguments.arguments; import java.util.stream.Stream; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeAfterOrEqualTo_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeAfterOrEqualTo_create_Test.java index 2a1a19357f..34d012ad3e 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeAfterOrEqualTo_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeAfterOrEqualTo_create_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeAfterOrEqualTo.shouldBeAfterOrEqualTo; import static org.assertj.core.presentation.StandardRepresentation.STANDARD_REPRESENTATION; -import static org.assertj.core.test.NeverEqualComparator.NEVER_EQUALS; +import static org.assertj.core.testkit.NeverEqualComparator.NEVER_EQUALS; import static org.assertj.core.util.DateUtil.parse; import org.assertj.core.description.Description; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeAfterYear_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeAfterYear_create_Test.java index df2c9e1e50..76397b169c 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeAfterYear_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeAfterYear_create_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeAfterYear.shouldBeAfterYear; import static org.assertj.core.presentation.StandardRepresentation.STANDARD_REPRESENTATION; -import static org.assertj.core.test.NeverEqualComparator.NEVER_EQUALS; +import static org.assertj.core.testkit.NeverEqualComparator.NEVER_EQUALS; import static org.assertj.core.util.DateUtil.parse; import org.assertj.core.description.TextDescription; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeAfter_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeAfter_create_Test.java index 912894147b..e6a67fc336 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeAfter_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeAfter_create_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeAfter.shouldBeAfter; import static org.assertj.core.presentation.StandardRepresentation.STANDARD_REPRESENTATION; -import static org.assertj.core.test.NeverEqualComparator.NEVER_EQUALS; +import static org.assertj.core.testkit.NeverEqualComparator.NEVER_EQUALS; import static org.assertj.core.util.DateUtil.parse; import org.assertj.core.description.Description; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeBeforeOrEqualTo_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeBeforeOrEqualTo_create_Test.java index 90c27b2f2a..10cfa11eee 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeBeforeOrEqualTo_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeBeforeOrEqualTo_create_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeBeforeOrEqualTo.shouldBeBeforeOrEqualTo; import static org.assertj.core.presentation.StandardRepresentation.STANDARD_REPRESENTATION; -import static org.assertj.core.test.NeverEqualComparator.NEVER_EQUALS; +import static org.assertj.core.testkit.NeverEqualComparator.NEVER_EQUALS; import static org.assertj.core.util.DateUtil.parse; import org.assertj.core.description.TextDescription; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeBeforeYear_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeBeforeYear_create_Test.java index 36cc2a7da8..b92ad9c8ab 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeBeforeYear_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeBeforeYear_create_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeBeforeYear.shouldBeBeforeYear; import static org.assertj.core.presentation.StandardRepresentation.STANDARD_REPRESENTATION; -import static org.assertj.core.test.NeverEqualComparator.NEVER_EQUALS; +import static org.assertj.core.testkit.NeverEqualComparator.NEVER_EQUALS; import static org.assertj.core.util.DateUtil.parse; import org.assertj.core.description.TextDescription; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeBefore_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeBefore_create_Test.java index 4786eb959b..cc0ec86c3d 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeBefore_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeBefore_create_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeBefore.shouldBeBefore; import static org.assertj.core.presentation.StandardRepresentation.STANDARD_REPRESENTATION; -import static org.assertj.core.test.NeverEqualComparator.NEVER_EQUALS; +import static org.assertj.core.testkit.NeverEqualComparator.NEVER_EQUALS; import static org.assertj.core.util.DateUtil.parse; import org.assertj.core.description.Description; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeBetween_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeBetween_create_Test.java index 8122cb0538..9cdec39ca5 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeBetween_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeBetween_create_Test.java @@ -15,7 +15,7 @@ import static java.lang.String.format; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeBetween.shouldBeBetween; -import static org.assertj.core.test.NeverEqualComparator.NEVER_EQUALS; +import static org.assertj.core.testkit.NeverEqualComparator.NEVER_EQUALS; import static org.assertj.core.util.DateUtil.parse; import org.assertj.core.description.Description; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeEqualByComparingFieldByFieldRecursively_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeEqualByComparingFieldByFieldRecursively_create_Test.java index f441c94455..bea32c1f8b 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeEqualByComparingFieldByFieldRecursively_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeEqualByComparingFieldByFieldRecursively_create_Test.java @@ -35,8 +35,8 @@ import org.assertj.core.internal.objects.Objects_assertIsEqualToComparingFieldByFieldRecursive_Test.WithCollection; import org.assertj.core.internal.objects.Objects_assertIsEqualToComparingFieldByFieldRecursive_Test.WithMap; import org.assertj.core.presentation.Representation; -import org.assertj.core.test.Jedi; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Jedi; +import org.assertj.core.testkit.Name; import org.junit.jupiter.api.Test; class ShouldBeEqualByComparingFieldByFieldRecursively_create_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeEqualByComparingOnlyGivenFields_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeEqualByComparingOnlyGivenFields_create_Test.java index a21de9c13c..debc9f2dc7 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeEqualByComparingOnlyGivenFields_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeEqualByComparingOnlyGivenFields_create_Test.java @@ -20,7 +20,7 @@ import org.assertj.core.description.Description; import org.assertj.core.description.TextDescription; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeEqualIgnoringCase_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeEqualIgnoringCase_create_Test.java index d69b301fba..72a0ffdf61 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeEqualIgnoringCase_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeEqualIgnoringCase_create_Test.java @@ -15,7 +15,7 @@ import static java.lang.String.format; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeEqualIgnoringCase.shouldBeEqual; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import org.assertj.core.description.Description; import org.assertj.core.internal.TestDescription; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeEqualToIgnoringGivenFields_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeEqualToIgnoringGivenFields_create_Test.java index c57b5af7ee..4cde2b8377 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeEqualToIgnoringGivenFields_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeEqualToIgnoringGivenFields_create_Test.java @@ -22,7 +22,7 @@ import org.assertj.core.description.Description; import org.assertj.core.description.TextDescription; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeEqual_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeEqual_Test.java index e151d7f909..f8fafae322 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeEqual_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeEqual_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.catchThrowableOfType; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.presentation.StandardRepresentation.STANDARD_REPRESENTATION; -import static org.assertj.core.test.AlwaysDifferentComparator.ALWAY_DIFFERENT; +import static org.assertj.core.testkit.AlwaysDifferentComparator.ALWAY_DIFFERENT; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.Lists.list; @@ -24,7 +24,7 @@ import java.util.Objects; import org.assertj.core.api.ThrowableAssert.ThrowingCallable; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.opentest4j.AssertionFailedError; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeEqual_equals_hashCode_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeEqual_equals_hashCode_Test.java index 7f56509efa..d653dd04d3 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeEqual_equals_hashCode_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeEqual_equals_hashCode_Test.java @@ -14,10 +14,10 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeEqual.shouldBeEqual; -import static org.assertj.core.test.EqualsHashCodeContractAssert.assertEqualsIsReflexive; -import static org.assertj.core.test.EqualsHashCodeContractAssert.assertEqualsIsSymmetric; -import static org.assertj.core.test.EqualsHashCodeContractAssert.assertEqualsIsTransitive; -import static org.assertj.core.test.EqualsHashCodeContractAssert.assertMaintainsEqualsAndHashCodeContract; +import static org.assertj.core.testkit.EqualsHashCodeContractAssert.assertEqualsIsReflexive; +import static org.assertj.core.testkit.EqualsHashCodeContractAssert.assertEqualsIsSymmetric; +import static org.assertj.core.testkit.EqualsHashCodeContractAssert.assertEqualsIsTransitive; +import static org.assertj.core.testkit.EqualsHashCodeContractAssert.assertMaintainsEqualsAndHashCodeContract; import org.assertj.core.presentation.StandardRepresentation; import org.junit.jupiter.api.BeforeAll; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeIn_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeIn_create_Test.java index 31874baefe..40a9a0846f 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeIn_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeIn_create_Test.java @@ -21,7 +21,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeSortedAccordingToComparator_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeSortedAccordingToComparator_create_Test.java index bce1bef219..52571c78a1 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeSortedAccordingToComparator_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeSortedAccordingToComparator_create_Test.java @@ -21,7 +21,7 @@ import org.assertj.core.internal.TestDescription; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeSubsetOf_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeSubsetOf_create_Test.java index dd2ce1ccb5..3c2ed3b2ce 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeSubsetOf_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeSubsetOf_create_Test.java @@ -20,7 +20,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeSubstringOf_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeSubstringOf_create_Test.java index 162e3c5fb3..3c25b6e6c2 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldBeSubstringOf_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldBeSubstringOf_create_Test.java @@ -20,7 +20,7 @@ import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.internal.StandardComparisonStrategy; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; class ShouldBeSubstringOf_create_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainAnyOf_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainAnyOf_create_Test.java index 7572cf3945..e7fddba69c 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainAnyOf_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainAnyOf_create_Test.java @@ -20,7 +20,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; class ShouldContainAnyOf_create_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainAtIndex_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainAtIndex_create_Test.java index 2cf91b51a1..a5daef3ac6 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainAtIndex_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainAtIndex_create_Test.java @@ -21,7 +21,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainCharSequenceOnlyOnce_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainCharSequenceOnlyOnce_create_Test.java index 7906ca0609..6db33135a4 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainCharSequenceOnlyOnce_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainCharSequenceOnlyOnce_create_Test.java @@ -20,7 +20,7 @@ import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.internal.TestDescription; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainCharSequence_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainCharSequence_create_Test.java index f925917951..cc3d3d1b26 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainCharSequence_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainCharSequence_create_Test.java @@ -26,7 +26,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.internal.StandardComparisonStrategy; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainEntries_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainEntries_create_Test.java index 3581c58495..7afab40c11 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainEntries_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainEntries_create_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldContainEntries.shouldContainEntries; import static org.assertj.core.presentation.StandardRepresentation.STANDARD_REPRESENTATION; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.Sets.set; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainEntry_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainEntry_create_Test.java index 94105ed7c1..1fec2d4754 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainEntry_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainEntry_create_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.configuration.ConfigurationProvider.CONFIGURATION_PROVIDER; import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldContainEntry.shouldContainEntry; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import java.util.Map; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainExactlyInAnyOrder_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainExactlyInAnyOrder_create_Test.java index e76bec95f8..99cbbdc056 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainExactlyInAnyOrder_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainExactlyInAnyOrder_create_Test.java @@ -23,7 +23,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainExactly_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainExactly_create_Test.java index 0a218fe8d4..bf40f6d78f 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainExactly_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainExactly_create_Test.java @@ -32,7 +32,7 @@ import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.internal.IndexedDiff; import org.assertj.core.internal.StandardComparisonStrategy; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainKey_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainKey_create_Test.java index 36272fcd5f..a29db815a3 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainKey_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainKey_create_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldContainKey.shouldContainKey; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import java.util.Map; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainKeys_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainKeys_create_Test.java index 23c91942d2..c2ca529894 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainKeys_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainKeys_create_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldContainKeys.shouldContainKeys; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import static org.assertj.core.util.Sets.newLinkedHashSet; import java.util.Map; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainOnlyKeys_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainOnlyKeys_create_Test.java index 3d4ca77098..84611b3a12 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainOnlyKeys_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainOnlyKeys_create_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldContainOnlyKeys.shouldContainOnlyKeys; import static org.assertj.core.presentation.StandardRepresentation.STANDARD_REPRESENTATION; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import static org.assertj.core.util.Lists.list; import static org.assertj.core.util.Sets.newLinkedHashSet; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainOnly_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainOnly_create_Test.java index 54e09e6b9c..f1ccc565ae 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainOnly_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainOnly_create_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldContainOnly.shouldContainOnly; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.Lists.list; import static org.assertj.core.util.Sets.newLinkedHashSet; @@ -30,8 +30,8 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.CaseInsensitiveStringComparator; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainSequenceOfCharSequence_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainSequenceOfCharSequence_create_Test.java index f2aec9e487..621cbd0208 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainSequenceOfCharSequence_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainSequenceOfCharSequence_create_Test.java @@ -19,7 +19,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainSequence_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainSequence_create_Test.java index 7f0206fc06..0702c6dc88 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainSequence_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainSequence_create_Test.java @@ -20,7 +20,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainSubsequenceOfCharSequence_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainSubsequenceOfCharSequence_create_Test.java index 386dc62460..196657387c 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainSubsequenceOfCharSequence_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainSubsequenceOfCharSequence_create_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.entry; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldContainSubsequenceOfCharSequence.shouldContainSubsequence; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import static org.assertj.core.util.Arrays.array; import java.util.stream.Stream; @@ -24,7 +24,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainSubsequence_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainSubsequence_create_Test.java index f8dddaaf46..9c2ad6f69b 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainSubsequence_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainSubsequence_create_Test.java @@ -23,7 +23,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.internal.StandardComparisonStrategy; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainValue_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainValue_create_Test.java index fe9c94f24f..45fc22d692 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainValue_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainValue_create_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldContainValue.shouldContainValue; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import java.util.Map; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainValues_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainValues_create_Test.java index 9ccd229a1f..516a302831 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainValues_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainValues_create_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldContainValues.shouldContainValues; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import static org.assertj.core.util.Sets.newLinkedHashSet; import java.util.Map; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldContain_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldContain_create_Test.java index d3a5e01c8d..0c29375fff 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldContain_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldContain_create_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldContain.directoryShouldContain; import static org.assertj.core.error.ShouldContain.shouldContain; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.Lists.list; import static org.assertj.core.util.Sets.newLinkedHashSet; @@ -32,8 +32,8 @@ import org.assertj.core.data.MapEntry; import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; -import org.assertj.core.test.CaseInsensitiveStringComparator; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainsOnlyOnce_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainsOnlyOnce_create_Test.java index 012ef4f5e4..e1e6631d07 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldContainsOnlyOnce_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldContainsOnlyOnce_create_Test.java @@ -21,7 +21,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldEndWith_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldEndWith_create_Test.java index 916ae3d939..cde4873daa 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldEndWith_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldEndWith_create_Test.java @@ -20,7 +20,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldHaveAllNullFields_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldHaveAllNullFields_create_Test.java index 303190698e..6446209981 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldHaveAllNullFields_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldHaveAllNullFields_create_Test.java @@ -21,8 +21,8 @@ import java.util.List; import org.assertj.core.internal.TestDescription; -import org.assertj.core.test.Jedi; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Jedi; +import org.assertj.core.testkit.Person; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldHaveComparableElementsAccordingToComparator_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldHaveComparableElementsAccordingToComparator_create_Test.java index eb0eb5890d..37e196afc7 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldHaveComparableElementsAccordingToComparator_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldHaveComparableElementsAccordingToComparator_create_Test.java @@ -19,7 +19,7 @@ import static org.assertj.core.util.Arrays.array; import org.assertj.core.internal.TestDescription; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldHaveFields_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldHaveFields_create_Test.java index 7dcd3a29e1..47f792a0f7 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldHaveFields_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldHaveFields_create_Test.java @@ -20,7 +20,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Person; import org.junit.jupiter.api.Test; class ShouldHaveFields_create_Test { @@ -35,7 +35,7 @@ void should_create_error_message_for_fields() { // THEN then(message).isEqualTo(format("[Test] %n" + "Expecting%n" - + " org.assertj.core.test.Person%n" + + " org.assertj.core.testkit.Person%n" + "to have the following public accessible fields:%n" + " [\"name\", \"address\"]%n" + "but it doesn't have:%n" @@ -52,7 +52,7 @@ void should_create_error_message_for_declared_fields() { // THEN then(message).isEqualTo(format("[Test] %n" + "Expecting%n" - + " org.assertj.core.test.Person%n" + + " org.assertj.core.testkit.Person%n" + "to have the following declared fields:%n" + " [\"name\", \"address\"]%n" + "but it doesn't have:%n" diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldHaveMethods_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldHaveMethods_create_Test.java index cf69746599..0737076df1 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldHaveMethods_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldHaveMethods_create_Test.java @@ -18,13 +18,13 @@ import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldHaveMethods.shouldHaveMethods; import static org.assertj.core.error.ShouldHaveMethods.shouldNotHaveMethods; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import static org.assertj.core.util.Sets.newTreeSet; import java.lang.reflect.Modifier; import org.assertj.core.description.TextDescription; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Person; import org.junit.jupiter.api.Test; /** @@ -43,7 +43,7 @@ void should_create_error_message_for_methods() { // THEN then(message).isEqualTo(format("[Test] %n" + "Expecting%n" + - " org.assertj.core.test.Person%n" + + " org.assertj.core.testkit.Person%n" + "to have methods:%n" + " [\"getAddress\", \"getName\"]%n" + "but could not find:%n" + @@ -61,7 +61,7 @@ void should_create_error_message_for_declared_methods() { // THEN then(message).isEqualTo(format("[Test] %n" + "Expecting%n" + - " org.assertj.core.test.Person%n" + + " org.assertj.core.testkit.Person%n" + "to have declared methods:%n" + " [\"getAddress\", \"getName\"]%n" + "but could not find:%n" + @@ -79,7 +79,7 @@ void should_create_error_message_for_shouldNotHave_PublicDeclared_Methods() { // THEN then(message).isEqualTo(format("[Test] %n" + "Expecting%n" + - " org.assertj.core.test.Person%n" + + " org.assertj.core.testkit.Person%n" + "not to have any declared public methods but it has the following:%n" + " [\"getName\"]")); } @@ -95,7 +95,7 @@ void should_create_error_message_for_shouldNotHave_Public_Methods() { // THEN then(message).isEqualTo(format("[Test] %n" + "Expecting%n" + - " org.assertj.core.test.Person%n" + + " org.assertj.core.testkit.Person%n" + "not to have any public methods but it has the following:%n" + " [\"getName\"]")); } @@ -109,7 +109,7 @@ void should_create_error_message_for_shouldNotHave_Declared_Methods() { // THEN then(message).isEqualTo(format("[Test] %n" + "Expecting%n" + - " org.assertj.core.test.Person%n" + + " org.assertj.core.testkit.Person%n" + "not to have any declared methods but it has the following:%n" + " [\"getName\"]")); } @@ -123,7 +123,7 @@ void should_create_error_message_for_shouldNotHaveMethods() { // THEN then(message).isEqualTo(format("[Test] %n" + "Expecting%n" + - " org.assertj.core.test.Person%n" + + " org.assertj.core.testkit.Person%n" + "not to have any methods but it has the following:%n" + " [\"getName\"]")); } @@ -140,7 +140,7 @@ void should_create_error_message_for_shouldHaveMethods_with_non_matching_modifie // THEN then(message).isEqualTo(format("[Test] %n" + "Expecting%n" + - " org.assertj.core.test.Person%n" + + " org.assertj.core.testkit.Person%n" + "to have public methods:%n" + " [\"finalize\"]%n" + "but the following are not public:%n" + diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldHaveToString_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldHaveToString_create_Test.java index 6c1782c2d6..bc5051cce8 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldHaveToString_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldHaveToString_create_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.presentation.StandardRepresentation.STANDARD_REPRESENTATION; import org.assertj.core.internal.TestDescription; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.Test; class ShouldHaveToString_create_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotBeEqual_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotBeEqual_create_Test.java index 55c2667c9f..6b0eecb635 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotBeEqual_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotBeEqual_create_Test.java @@ -19,7 +19,7 @@ import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.internal.TestDescription; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotBeIn_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotBeIn_create_Test.java index 705dc71847..4a7c1981be 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotBeIn_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotBeIn_create_Test.java @@ -20,7 +20,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainAtIndex_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainAtIndex_create_Test.java index 4489679f32..4a8c866e26 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainAtIndex_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainAtIndex_create_Test.java @@ -21,7 +21,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainCharSequence_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainCharSequence_create_Test.java index 45f40ae53e..6b993b16af 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainCharSequence_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainCharSequence_create_Test.java @@ -24,7 +24,7 @@ import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.internal.StandardComparisonStrategy; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainKey_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainKey_create_Test.java index d597838337..f063305b46 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainKey_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainKey_create_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldNotContainKey.shouldNotContainKey; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import java.util.Map; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainKeys_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainKeys_create_Test.java index 066379f4f6..2d0684f3da 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainKeys_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainKeys_create_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldNotContainKeys.shouldNotContainKeys; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import static org.assertj.core.util.Sets.newLinkedHashSet; import java.util.Map; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainSequence_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainSequence_create_Test.java index 8295ce754c..0f4ab640cf 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainSequence_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainSequence_create_Test.java @@ -20,7 +20,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; class ShouldNotContainSequence_create_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainSubsequence_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainSubsequence_create_Test.java index 5ee5d6e5fb..e11588f1be 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainSubsequence_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainSubsequence_create_Test.java @@ -20,7 +20,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; class ShouldNotContainSubsequence_create_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainValue_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainValue_create_Test.java index 0523dcec60..45654dde2e 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainValue_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContainValue_create_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldNotContainValue.shouldNotContainValue; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import java.util.Map; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContain_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContain_create_Test.java index 7152553242..c1fadf5321 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContain_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotContain_create_Test.java @@ -29,7 +29,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotEndWithIgnoringCase_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotEndWithIgnoringCase_create_Test.java index 1ed149897f..540699fd4e 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotEndWithIgnoringCase_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotEndWithIgnoringCase_create_Test.java @@ -20,7 +20,7 @@ import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.internal.StandardComparisonStrategy; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; class ShouldNotEndWithIgnoringCase_create_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotEndWith_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotEndWith_create_Test.java index 8564ded636..ef0b102a63 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotEndWith_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotEndWith_create_Test.java @@ -20,7 +20,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotHaveDuplicates_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotHaveDuplicates_create_Test.java index 816ef9366a..98076ce3fd 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotHaveDuplicates_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotHaveDuplicates_create_Test.java @@ -20,7 +20,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotHaveSameHashCode_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotHaveSameHashCode_create_Test.java index 5c193d8151..ce1f8ffabb 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotHaveSameHashCode_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotHaveSameHashCode_create_Test.java @@ -18,7 +18,7 @@ import org.assertj.core.internal.TestDescription; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.Test; class ShouldNotHaveSameHashCode_create_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotStartWith_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotStartWith_create_Test.java index 0bc9bf2aba..414fcbe3fe 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldNotStartWith_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldNotStartWith_create_Test.java @@ -20,7 +20,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldOnlyHaveFields_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldOnlyHaveFields_create_Test.java index 370b24a5ac..51b68742e2 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldOnlyHaveFields_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldOnlyHaveFields_create_Test.java @@ -25,7 +25,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.presentation.Representation; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.test.Player; +import org.assertj.core.testkit.Player; import org.junit.jupiter.api.Test; /** @@ -50,7 +50,7 @@ void should_create_error_message_for_fields() { // THEN then(message).isEqualTo(format("[Test] %n" + "Expecting%n" + - " org.assertj.core.test.Player%n" + + " org.assertj.core.testkit.Player%n" + "to only have the following public accessible fields:%n" + " [\"name\", \"team\"]%n" + "fields not found:%n" + @@ -70,7 +70,7 @@ void should_not_display_unexpected_fields_when_there_are_none_for_fields() { // THEN then(message).isEqualTo(format("[Test] %n" + "Expecting%n" + - " org.assertj.core.test.Player%n" + + " org.assertj.core.testkit.Player%n" + "to only have the following public accessible fields:%n" + " [\"name\", \"team\"]%n" + "but could not find the following fields:%n" + @@ -89,7 +89,7 @@ void should_not_display_fields_not_found_when_there_are_none_for_fields() { // THEN then(message).isEqualTo(format("[Test] %n" + "Expecting%n" + - " org.assertj.core.test.Player%n" + + " org.assertj.core.testkit.Player%n" + "to only have the following public accessible fields:%n" + " [\"name\", \"team\"]%n" + "but the following fields were unexpected:%n" + @@ -108,7 +108,7 @@ void should_create_error_message_for_declared_fields() { // THEN then(message).isEqualTo(format("[Test] %n" + "Expecting%n" + - " org.assertj.core.test.Player%n" + + " org.assertj.core.testkit.Player%n" + "to only have the following declared fields:%n" + " [\"name\", \"team\"]%n" + "fields not found:%n" + @@ -129,7 +129,7 @@ void should_not_display_unexpected_fields_when_there_are_none_for_declared_field // THEN then(message).isEqualTo(format("[Test] %n" + "Expecting%n" + - " org.assertj.core.test.Player%n" + + " org.assertj.core.testkit.Player%n" + "to only have the following declared fields:%n" + " [\"name\", \"team\"]%n" + "but could not find the following fields:%n" + @@ -148,7 +148,7 @@ void should_not_display_fields_not_found_when_there_are_none_for_declared_fields // THEN then(message).isEqualTo(String.format("[Test] %n" + "Expecting%n" + - " org.assertj.core.test.Player%n" + + " org.assertj.core.testkit.Player%n" + "to only have the following declared fields:%n" + " [\"name\", \"team\"]%n" + "but the following fields were unexpected:%n" + diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldSatisfyOnlyOnce_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldSatisfyOnlyOnce_create_Test.java index 39462f5953..63baba6a8d 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldSatisfyOnlyOnce_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldSatisfyOnlyOnce_create_Test.java @@ -19,7 +19,7 @@ import org.assertj.core.description.Description; import org.assertj.core.description.TextDescription; -import org.assertj.core.test.jdk11.Jdk11.List; +import org.assertj.core.testkit.jdk11.Jdk11.List; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/error/ShouldStartWith_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ShouldStartWith_create_Test.java index e12bee80dd..262a387969 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ShouldStartWith_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ShouldStartWith_create_Test.java @@ -20,7 +20,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/error/ZippedElementsShouldSatisfy_create_Test.java b/assertj-core/src/test/java/org/assertj/core/error/ZippedElementsShouldSatisfy_create_Test.java index 3623dbdc88..4c24bcad82 100644 --- a/assertj-core/src/test/java/org/assertj/core/error/ZippedElementsShouldSatisfy_create_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/error/ZippedElementsShouldSatisfy_create_Test.java @@ -15,7 +15,7 @@ import static java.lang.String.format; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ZippedElementsShouldSatisfy.zippedElementsShouldSatisfy; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Lists.list; import java.util.List; diff --git a/assertj-core/src/test/java/org/assertj/core/extractor/ByNameMultipleExtractorTest.java b/assertj-core/src/test/java/org/assertj/core/extractor/ByNameMultipleExtractorTest.java index 431f706d67..dbc33abb18 100644 --- a/assertj-core/src/test/java/org/assertj/core/extractor/ByNameMultipleExtractorTest.java +++ b/assertj-core/src/test/java/org/assertj/core/extractor/ByNameMultipleExtractorTest.java @@ -16,13 +16,13 @@ import static org.assertj.core.api.Assertions.tuple; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.data.MapEntry.entry; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import java.util.Map; import org.assertj.core.groups.Tuple; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.assertj.core.util.introspection.IntrospectionError; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/extractor/ByNameSingleExtractorTest.java b/assertj-core/src/test/java/org/assertj/core/extractor/ByNameSingleExtractorTest.java index bf4ea9aa81..92a7bdec40 100644 --- a/assertj-core/src/test/java/org/assertj/core/extractor/ByNameSingleExtractorTest.java +++ b/assertj-core/src/test/java/org/assertj/core/extractor/ByNameSingleExtractorTest.java @@ -15,13 +15,13 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.data.MapEntry.entry; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import java.util.Map; import java.util.OptionalInt; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.assertj.core.util.introspection.Introspection; import org.assertj.core.util.introspection.IntrospectionError; import org.junit.jupiter.api.DisplayName; diff --git a/assertj-core/src/test/java/org/assertj/core/extractor/ToStringExtractorTest.java b/assertj-core/src/test/java/org/assertj/core/extractor/ToStringExtractorTest.java index 7b026606c5..621ce486c0 100644 --- a/assertj-core/src/test/java/org/assertj/core/extractor/ToStringExtractorTest.java +++ b/assertj-core/src/test/java/org/assertj/core/extractor/ToStringExtractorTest.java @@ -14,8 +14,8 @@ import static org.assertj.core.api.BDDAssertions.then; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/groups/FieldsOrPropertiesExtractor_extract_Test.java b/assertj-core/src/test/java/org/assertj/core/groups/FieldsOrPropertiesExtractor_extract_Test.java index 525f827a7d..b28f269d77 100644 --- a/assertj-core/src/test/java/org/assertj/core/groups/FieldsOrPropertiesExtractor_extract_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/groups/FieldsOrPropertiesExtractor_extract_Test.java @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.List; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.assertj.core.util.introspection.IntrospectionError; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/groups/FieldsOrPropertiesExtractor_extract_tuples_Test.java b/assertj-core/src/test/java/org/assertj/core/groups/FieldsOrPropertiesExtractor_extract_tuples_Test.java index d557e924af..43464dc94e 100644 --- a/assertj-core/src/test/java/org/assertj/core/groups/FieldsOrPropertiesExtractor_extract_tuples_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/groups/FieldsOrPropertiesExtractor_extract_tuples_Test.java @@ -24,8 +24,8 @@ import java.util.List; import java.util.Set; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.assertj.core.util.introspection.IntrospectionError; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/groups/Properties_from_with_Collection_Test.java b/assertj-core/src/test/java/org/assertj/core/groups/Properties_from_with_Collection_Test.java index 227ab6e5c7..6d90603c74 100644 --- a/assertj-core/src/test/java/org/assertj/core/groups/Properties_from_with_Collection_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/groups/Properties_from_with_Collection_Test.java @@ -20,8 +20,8 @@ import java.util.Collection; import java.util.List; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.assertj.core.util.introspection.PropertySupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/groups/Properties_from_with_array_Test.java b/assertj-core/src/test/java/org/assertj/core/groups/Properties_from_with_array_Test.java index 595b235acc..3da70b822a 100644 --- a/assertj-core/src/test/java/org/assertj/core/groups/Properties_from_with_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/groups/Properties_from_with_array_Test.java @@ -21,8 +21,8 @@ import java.util.List; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.assertj.core.util.introspection.PropertySupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/AbstractTest_ComparatorBasedComparisonStrategy.java b/assertj-core/src/test/java/org/assertj/core/internal/AbstractTest_ComparatorBasedComparisonStrategy.java index 08d87854c6..cecf3759d9 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/AbstractTest_ComparatorBasedComparisonStrategy.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/AbstractTest_ComparatorBasedComparisonStrategy.java @@ -14,7 +14,7 @@ import java.util.Comparator; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; public class AbstractTest_ComparatorBasedComparisonStrategy { diff --git a/assertj-core/src/test/java/org/assertj/core/internal/Arrays_assertContains_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/Arrays_assertContains_Test.java index 1b03b3069f..53b90c1140 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/Arrays_assertContains_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/Arrays_assertContains_Test.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContain.shouldContain; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.IntArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.IntArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/Arrays_containsAnyOf_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/Arrays_containsAnyOf_Test.java index 4a8a16ec8e..b3fb84d176 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/Arrays_containsAnyOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/Arrays_containsAnyOf_Test.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainAnyOf.shouldContainAnyOf; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/BaseArraysTest.java b/assertj-core/src/test/java/org/assertj/core/internal/BaseArraysTest.java index 7261517244..b715a1701b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/BaseArraysTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/BaseArraysTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.util.Arrays.array; import static org.mockito.Mockito.spy; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; public class BaseArraysTest { diff --git a/assertj-core/src/test/java/org/assertj/core/internal/Boolean2DArraysBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/Boolean2DArraysBaseTest.java index ea87d3c4c9..09f7828798 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/Boolean2DArraysBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/Boolean2DArraysBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/BooleanArraysBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/BooleanArraysBaseTest.java index 28aee41081..09f88d545f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/BooleanArraysBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/BooleanArraysBaseTest.java @@ -12,8 +12,8 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.BooleanArrays.arrayOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.spy; import org.assertj.core.api.WritableAssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/Byte2DArraysBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/Byte2DArraysBaseTest.java index 43732cc0b5..2b401b4d4c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/Byte2DArraysBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/Byte2DArraysBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/ByteArraysBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/ByteArraysBaseTest.java index 704267c139..a4df345dca 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/ByteArraysBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/ByteArraysBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.arrayOf; import static org.mockito.Mockito.spy; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/Char2DArraysBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/Char2DArraysBaseTest.java index 9974a67aad..91582053c1 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/Char2DArraysBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/Char2DArraysBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/CharArraysBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/CharArraysBaseTest.java index a6e63cf23b..fc62985f47 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/CharArraysBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/CharArraysBaseTest.java @@ -12,12 +12,12 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.arrayOf; import static org.mockito.Mockito.spy; import java.util.Comparator; -import org.assertj.core.test.CaseInsensitiveCharacterComparator; +import org.assertj.core.testkit.CaseInsensitiveCharacterComparator; import org.junit.jupiter.api.BeforeEach; /** diff --git a/assertj-core/src/test/java/org/assertj/core/internal/CharactersBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/CharactersBaseTest.java index f27f4b616e..3831f0c05e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/CharactersBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/CharactersBaseTest.java @@ -14,7 +14,7 @@ import static org.mockito.Mockito.spy; -import org.assertj.core.test.CaseInsensitiveCharacterComparator; +import org.assertj.core.testkit.CaseInsensitiveCharacterComparator; import org.junit.jupiter.api.BeforeEach; /** diff --git a/assertj-core/src/test/java/org/assertj/core/internal/ComparatorBasedComparisonStrategy_isGreaterThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/ComparatorBasedComparisonStrategy_isGreaterThan_Test.java index fddb5de404..ddc536f8fa 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/ComparatorBasedComparisonStrategy_isGreaterThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/ComparatorBasedComparisonStrategy_isGreaterThan_Test.java @@ -19,7 +19,7 @@ import java.awt.*; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/internal/DatesBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/DatesBaseTest.java index 7bd66aaf3e..bd7ce997d4 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/DatesBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/DatesBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.spy; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/DeepDifference_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/DeepDifference_Test.java index eeb42f470f..60ec8757af 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/DeepDifference_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/DeepDifference_Test.java @@ -23,7 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.internal.ObjectsBaseTest.noFieldComparators; import static org.assertj.core.internal.TypeComparators.defaultTypeComparators; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; import static org.assertj.core.util.BigDecimalComparator.BIG_DECIMAL_COMPARATOR; import static org.assertj.core.util.Lists.newArrayList; import static org.assertj.core.util.Sets.newLinkedHashSet; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/Double2DArraysBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/Double2DArraysBaseTest.java index fd117523ca..fbb6bedf46 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/Double2DArraysBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/Double2DArraysBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/DoubleArraysBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/DoubleArraysBaseTest.java index 23b2777748..ed51a3fe7a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/DoubleArraysBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/DoubleArraysBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; import static org.mockito.Mockito.spy; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/DoublesBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/DoublesBaseTest.java index c20a6727db..c565282822 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/DoublesBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/DoublesBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.spy; import org.assertj.core.api.WritableAssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/ExtendedByTypesComparator_compareTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/ExtendedByTypesComparator_compareTo_Test.java index f207b3b547..bcb81724fa 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/ExtendedByTypesComparator_compareTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/ExtendedByTypesComparator_compareTo_Test.java @@ -17,7 +17,7 @@ import java.math.BigDecimal; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.assertj.core.util.BigDecimalComparator; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/ExtendedByTypesComparator_toString_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/ExtendedByTypesComparator_toString_Test.java index 1ecefc1684..758445a21f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/ExtendedByTypesComparator_toString_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/ExtendedByTypesComparator_toString_Test.java @@ -15,7 +15,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.internal.TypeComparators.defaultTypeComparators; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; import java.math.BigDecimal; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/FieldByFieldComparator_toString_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/FieldByFieldComparator_toString_Test.java index 079ac28ac0..069bfd94f3 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/FieldByFieldComparator_toString_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/FieldByFieldComparator_toString_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_STRING; import org.assertj.core.util.BigDecimalComparator; import org.junit.jupiter.api.BeforeEach; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/FilesBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/FilesBaseTest.java index a5f4311858..a08430c51f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/FilesBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/FilesBaseTest.java @@ -13,7 +13,7 @@ package org.assertj.core.internal; import static java.util.regex.Pattern.CASE_INSENSITIVE; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/FilesSimpleBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/FilesSimpleBaseTest.java index 81abd8951d..b14ef3e4ae 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/FilesSimpleBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/FilesSimpleBaseTest.java @@ -13,7 +13,7 @@ package org.assertj.core.internal; import static java.util.Arrays.stream; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.spy; import java.io.File; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/Float2DArraysBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/Float2DArraysBaseTest.java index 1d0599384f..70094d9614 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/Float2DArraysBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/Float2DArraysBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/FloatArraysBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/FloatArraysBaseTest.java index 792ed126ad..988b62a7ba 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/FloatArraysBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/FloatArraysBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.arrayOf; import static org.mockito.Mockito.spy; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/FloatsBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/FloatsBaseTest.java index b566effe7b..c0429eb07c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/FloatsBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/FloatsBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.spy; import org.assertj.core.api.WritableAssertionInfo; @@ -55,4 +55,4 @@ protected Float NaN() { protected Float absDiff(Float actual, Float other) { return Floats.instance().absDiff(actual, other); } -} \ No newline at end of file +} diff --git a/assertj-core/src/test/java/org/assertj/core/internal/InputStreamsBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/InputStreamsBaseTest.java index 7347c14a4f..d6e0960999 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/InputStreamsBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/InputStreamsBaseTest.java @@ -13,7 +13,7 @@ package org.assertj.core.internal; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/Int2DArraysBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/Int2DArraysBaseTest.java index 6acd38ca51..bc6c9a5691 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/Int2DArraysBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/Int2DArraysBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/IntArraysBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/IntArraysBaseTest.java index 200357d647..bb6b7fb1ac 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/IntArraysBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/IntArraysBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.arrayOf; import static org.mockito.Mockito.spy; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/IterableDiff_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/IterableDiff_Test.java index 520e28b298..9d5761d67a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/IterableDiff_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/IterableDiff_Test.java @@ -19,7 +19,7 @@ import java.util.List; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/IterablesBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/IterablesBaseTest.java index 3cba69203c..9083466fa3 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/IterablesBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/IterablesBaseTest.java @@ -13,7 +13,7 @@ package org.assertj.core.internal; import static java.lang.String.CASE_INSENSITIVE_ORDER; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.spy; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/IteratorsBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/IteratorsBaseTest.java index 7f90f55e65..1d0175ca46 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/IteratorsBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/IteratorsBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.spy; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/ListsBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/ListsBaseTest.java index 2652a886d4..5f2b3782f3 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/ListsBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/ListsBaseTest.java @@ -14,7 +14,7 @@ import static org.mockito.Mockito.spy; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; /** diff --git a/assertj-core/src/test/java/org/assertj/core/internal/Long2DArraysBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/Long2DArraysBaseTest.java index 868caac08a..f6e6e9af94 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/Long2DArraysBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/Long2DArraysBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/LongArraysBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/LongArraysBaseTest.java index 4891d2bb16..75ca95d931 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/LongArraysBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/LongArraysBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.arrayOf; import static org.mockito.Mockito.spy; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/LongsBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/LongsBaseTest.java index b9fa3c1ba1..07cd2779ca 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/LongsBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/LongsBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.spy; import org.assertj.core.api.WritableAssertionInfo; @@ -47,4 +47,4 @@ public void setUp() { longsWithAbsValueComparisonStrategy.failures = failures; } -} \ No newline at end of file +} diff --git a/assertj-core/src/test/java/org/assertj/core/internal/MapsBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/MapsBaseTest.java index 23dba80539..4c9910a078 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/MapsBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/MapsBaseTest.java @@ -15,8 +15,8 @@ import static java.lang.String.CASE_INSENSITIVE_ORDER; import static java.util.Comparator.naturalOrder; import static org.assertj.core.data.MapEntry.entry; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -34,7 +34,7 @@ import org.apache.commons.lang3.ArrayUtils; import org.assertj.core.api.AssertionInfo; import org.assertj.core.data.MapEntry; -import org.assertj.core.test.WithPlayerData; +import org.assertj.core.testkit.WithPlayerData; import org.hibernate.collection.spi.CollectionSemantics; import org.hibernate.collection.spi.PersistentMap; import org.hibernate.collection.spi.PersistentSortedMap; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/NumbersBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/NumbersBaseTest.java index 195ffdf4bd..ad3fd16173 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/NumbersBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/NumbersBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.spy; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/Object2DArraysBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/Object2DArraysBaseTest.java index 04d8f4d13e..b1d24d6a3b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/Object2DArraysBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/Object2DArraysBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/ObjectArraysBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/ObjectArraysBaseTest.java index 4c38763095..23a1112e3e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/ObjectArraysBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/ObjectArraysBaseTest.java @@ -12,14 +12,14 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.mockito.Mockito.spy; import java.util.Comparator; import org.assertj.core.api.AssertionInfo; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; /** diff --git a/assertj-core/src/test/java/org/assertj/core/internal/ObjectsBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/ObjectsBaseTest.java index 288760e031..e4261532e1 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/ObjectsBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/ObjectsBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.spy; import java.util.Comparator; @@ -21,7 +21,7 @@ import org.assertj.core.api.AssertionInfo; import org.assertj.core.api.Assertions; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; /** diff --git a/assertj-core/src/test/java/org/assertj/core/internal/PathsBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/PathsBaseTest.java index dab5b0aa20..b6ab91718c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/PathsBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/PathsBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mockingDetails; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/PathsSimpleBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/PathsSimpleBaseTest.java index e2b87dc210..e95d671605 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/PathsSimpleBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/PathsSimpleBaseTest.java @@ -13,7 +13,7 @@ package org.assertj.core.internal; import static java.util.Arrays.stream; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.spy; import java.io.IOException; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/Short2DArraysBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/Short2DArraysBaseTest.java index 0ab198ad46..6db6c9fa63 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/Short2DArraysBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/Short2DArraysBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/ShortArraysBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/ShortArraysBaseTest.java index 1aace1280d..ca4f8ca21b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/ShortArraysBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/ShortArraysBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.arrayOf; import static org.mockito.Mockito.spy; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/SpliteratorsBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/SpliteratorsBaseTest.java index 7a42db4b9c..a57df8298b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/SpliteratorsBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/SpliteratorsBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.spy; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/StringsBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/StringsBaseTest.java index c2313c405c..bb329aa415 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/StringsBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/StringsBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.spy; import java.util.Collections; @@ -20,7 +20,7 @@ import java.util.Set; import org.assertj.core.api.AssertionInfo; -import org.assertj.core.test.CaseInsensitiveStringComparator; +import org.assertj.core.testkit.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; /** diff --git a/assertj-core/src/test/java/org/assertj/core/internal/ThrowablesBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/ThrowablesBaseTest.java index eef18860b1..27038f6c0d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/ThrowablesBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/ThrowablesBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.spy; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/UrisBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/UrisBaseTest.java index 93aba585c6..8b6dc8fbcd 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/UrisBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/UrisBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.spy; import java.util.List; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/UrlsBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/UrlsBaseTest.java index 29ab0618c2..cec1afc378 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/UrlsBaseTest.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/UrlsBaseTest.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.spy; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertContains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertContains_at_Index_Test.java index 9a2418c1e2..b642318638 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertContains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertContains_at_Index_Test.java @@ -20,8 +20,8 @@ import static org.assertj.core.error.ShouldContainAtIndex.shouldContainAtIndex; import static org.assertj.core.error.ShouldNotBeEmpty.shouldNotBeEmpty; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertDoesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertDoesNotContain_at_Index_Test.java index 0c7aa9859e..5ae83bfda7 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertDoesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertDoesNotContain_at_Index_Test.java @@ -17,8 +17,8 @@ import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; import static org.assertj.core.error.ShouldNotContainAtIndex.shouldNotContainAtIndex; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertEmpty_Test.java index add404dba9..97d74f154c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertEmpty_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeEmpty.shouldBeEmpty; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertHasDimensions_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertHasDimensions_Test.java index bf60b6db8b..75cd098ccf 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertHasDimensions_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertHasDimensions_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.error.ShouldHaveDimensions.shouldHaveFirstDimension; import static org.assertj.core.error.ShouldHaveDimensions.shouldHaveSize; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertHasSameDimensionsAs_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertHasSameDimensionsAs_Test.java index 838abcabc1..3658b9ad47 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertHasSameDimensionsAs_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertHasSameDimensionsAs_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldHaveSameDimensionsAs.shouldHaveSameDimensionsAs; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.junit.jupiter.params.provider.Arguments.arguments; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertNotEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertNotEmpty_Test.java index bf1e1630e0..d5513909d6 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertNotEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertNotEmpty_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeEmpty.shouldNotBeEmpty; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import java.util.stream.Stream; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertNullOrEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertNullOrEmpty_Test.java index 43cb09ebdc..d8ce725105 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertNullOrEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertNullOrEmpty_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeNullOrEmpty.shouldBeNullOrEmpty; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertNumberOfRows_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertNumberOfRows_Test.java index 1159e9d89b..955a21ed2d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertNumberOfRows_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/arrays2d/Arrays2D_assertNumberOfRows_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldHaveDimensions.shouldHaveFirstDimension; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import java.util.stream.Stream; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertEqualByComparison_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertEqualByComparison_Test.java index 392cd0905e..f3f1904e27 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertEqualByComparison_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertEqualByComparison_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEqual.shouldBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertEqual_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertEqual_Test.java index 72e7b71f0c..f6bc680f1b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertEqual_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertEqual_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEqual.shouldBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertGreaterThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertGreaterThanOrEqualTo_Test.java index 0f053512e9..4cea04a5d2 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertGreaterThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertGreaterThanOrEqualTo_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeGreaterOrEqual.shouldBeGreaterOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertGreaterThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertGreaterThan_Test.java index 6ba56ebf59..38f4791689 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertGreaterThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertGreaterThan_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeGreater.shouldBeGreater; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsBetween_Test.java index 707b918ea0..9b56410eec 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsBetween_Test.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeBetween.shouldBeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsCloseToPercentage_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsCloseToPercentage_Test.java index f6c50e424a..e956e5031c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsCloseToPercentage_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsCloseToPercentage_Test.java @@ -23,7 +23,7 @@ import static org.assertj.core.api.Assertions.withinPercentage; import static org.assertj.core.data.Percentage.withPercentage; import static org.assertj.core.error.ShouldBeEqualWithinPercentage.shouldBeEqualWithinPercentage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsCloseTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsCloseTo_Test.java index 3f060906a1..a31dff93e5 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsCloseTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsCloseTo_Test.java @@ -24,7 +24,7 @@ import static org.assertj.core.data.Offset.offset; import static org.assertj.core.error.ShouldBeEqualWithinOffset.shouldBeEqual; import static org.assertj.core.internal.ErrorMessages.offsetIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsNegative_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsNegative_Test.java index 486378ea88..94f83ddabb 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsNegative_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsNegative_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeLess.shouldBeLess; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import java.math.BigDecimal; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsNotCloseToPercentage_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsNotCloseToPercentage_Test.java index dad97c06d3..a6fdc7ff2a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsNotCloseToPercentage_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsNotCloseToPercentage_Test.java @@ -23,7 +23,7 @@ import static org.assertj.core.api.Assertions.withinPercentage; import static org.assertj.core.data.Percentage.withPercentage; import static org.assertj.core.error.ShouldNotBeEqualWithinPercentage.shouldNotBeEqualWithinPercentage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsNotCloseTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsNotCloseTo_Test.java index cb22fb6ab3..92be963235 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsNotCloseTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsNotCloseTo_Test.java @@ -23,7 +23,7 @@ import static org.assertj.core.api.Assertions.within; import static org.assertj.core.data.Offset.offset; import static org.assertj.core.error.ShouldNotBeEqualWithinOffset.shouldNotBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsNotNegative_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsNotNegative_Test.java index 3284f92b55..cceb3916ed 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsNotNegative_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsNotNegative_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import java.math.BigDecimal; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsNotPositive_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsNotPositive_Test.java index d0637a4ece..e10db0abdf 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsNotPositive_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsNotPositive_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeLessOrEqual.shouldBeLessOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import java.math.BigDecimal; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsNotZero_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsNotZero_Test.java index 60b1e01d48..c59bd4f980 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsNotZero_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsNotZero_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import java.math.BigDecimal; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsOne_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsOne_Test.java index 0a97347632..7929d9bf0f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsOne_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsOne_Test.java @@ -13,8 +13,8 @@ package org.assertj.core.internal.bigdecimals; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.TestData.someInfo; import java.math.BigDecimal; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsPositive_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsPositive_Test.java index 43b6038e02..b45862b3e6 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsPositive_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsPositive_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import java.math.BigDecimal; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsStrictlyBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsStrictlyBetween_Test.java index 0fb20a08c7..12f3856a17 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsStrictlyBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsStrictlyBetween_Test.java @@ -21,7 +21,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeBetween.shouldBeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsZero_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsZero_Test.java index 117071fdfd..13c9e27055 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsZero_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertIsZero_Test.java @@ -13,8 +13,8 @@ package org.assertj.core.internal.bigdecimals; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.TestData.someInfo; import java.math.BigDecimal; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertLessThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertLessThanOrEqualTo_Test.java index e59c9f4f18..2ae09525f4 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertLessThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertLessThanOrEqualTo_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeLessOrEqual.shouldBeLessOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertLessThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertLessThan_Test.java index 0e4fc9f762..6a52dad0d4 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertLessThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertLessThan_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeLess.shouldBeLess; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertNotEqualByComparison_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertNotEqualByComparison_Test.java index d29d2a02bc..d225eb11aa 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertNotEqualByComparison_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertNotEqualByComparison_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeEqual.shouldNotBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertNotEqual_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertNotEqual_Test.java index 6bb4d15220..14cbc6648b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertNotEqual_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigdecimals/BigDecimals_assertNotEqual_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeEqual.shouldNotBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertEqualByComparison_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertEqualByComparison_Test.java index 5599dc0681..0d1dc6d972 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertEqualByComparison_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertEqualByComparison_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEqual.shouldBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertEqual_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertEqual_Test.java index ab231f1f57..c89801eb81 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertEqual_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertEqual_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEqual.shouldBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertGreaterThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertGreaterThanOrEqualTo_Test.java index 33c12b6f54..443f580d2a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertGreaterThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertGreaterThanOrEqualTo_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeGreaterOrEqual.shouldBeGreaterOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertGreaterThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertGreaterThan_Test.java index e142b7b9db..b5b797c703 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertGreaterThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertGreaterThan_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeGreater.shouldBeGreater; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsBetween_Test.java index d64393bafb..ee276d0816 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsBetween_Test.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeBetween.shouldBeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsCloseToPercentage_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsCloseToPercentage_Test.java index 31bd1f4b12..6b0538e958 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsCloseToPercentage_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsCloseToPercentage_Test.java @@ -23,7 +23,7 @@ import static org.assertj.core.api.Assertions.withinPercentage; import static org.assertj.core.data.Percentage.withPercentage; import static org.assertj.core.error.ShouldBeEqualWithinPercentage.shouldBeEqualWithinPercentage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsCloseTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsCloseTo_Test.java index ae3e50336d..a022a12de1 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsCloseTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsCloseTo_Test.java @@ -24,7 +24,7 @@ import static org.assertj.core.data.Offset.offset; import static org.assertj.core.error.ShouldBeEqualWithinOffset.shouldBeEqual; import static org.assertj.core.internal.ErrorMessages.offsetIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsNegative_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsNegative_Test.java index 945845f563..5dcb17fae2 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsNegative_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsNegative_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeLess.shouldBeLess; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import java.math.BigInteger; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsNotCloseToPercentage_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsNotCloseToPercentage_Test.java index e0732fa1a3..06de804bf3 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsNotCloseToPercentage_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsNotCloseToPercentage_Test.java @@ -23,7 +23,7 @@ import static org.assertj.core.api.Assertions.withinPercentage; import static org.assertj.core.data.Percentage.withPercentage; import static org.assertj.core.error.ShouldNotBeEqualWithinPercentage.shouldNotBeEqualWithinPercentage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsNotCloseTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsNotCloseTo_Test.java index ab856cd330..f62b5df229 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsNotCloseTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsNotCloseTo_Test.java @@ -23,7 +23,7 @@ import static org.assertj.core.api.Assertions.within; import static org.assertj.core.data.Offset.offset; import static org.assertj.core.error.ShouldNotBeEqualWithinOffset.shouldNotBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsNotNegative_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsNotNegative_Test.java index 4d7a952ada..f1a7f19dfa 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsNotNegative_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsNotNegative_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import java.math.BigInteger; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsNotPositive_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsNotPositive_Test.java index 377297cd69..9a4950ec8d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsNotPositive_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsNotPositive_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeLessOrEqual.shouldBeLessOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import java.math.BigInteger; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsNotZero_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsNotZero_Test.java index 661243cfb9..014c94d06a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsNotZero_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsNotZero_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import java.math.BigInteger; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsOne_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsOne_Test.java index 06035c18d3..dff1b288f7 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsOne_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsOne_Test.java @@ -13,8 +13,8 @@ package org.assertj.core.internal.bigintegers; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.TestData.someInfo; import java.math.BigInteger; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsPositive_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsPositive_Test.java index 87723eff01..79c458e9de 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsPositive_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsPositive_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import java.math.BigInteger; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsStrictlyBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsStrictlyBetween_Test.java index 33bbb538db..a578cf89fe 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsStrictlyBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsStrictlyBetween_Test.java @@ -21,7 +21,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeBetween.shouldBeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsZero_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsZero_Test.java index feffe74da0..d8ac3c36fc 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsZero_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertIsZero_Test.java @@ -13,8 +13,8 @@ package org.assertj.core.internal.bigintegers; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.TestData.someInfo; import java.math.BigInteger; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertLessThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertLessThanOrEqualTo_Test.java index f50a60442b..3374456ddf 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertLessThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertLessThanOrEqualTo_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeLessOrEqual.shouldBeLessOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertLessThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertLessThan_Test.java index cc5af60e20..76c03d4ec2 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertLessThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertLessThan_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeLess.shouldBeLess; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertNotEqualByComparison_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertNotEqualByComparison_Test.java index 61e481cd2c..a1e6785e18 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertNotEqualByComparison_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertNotEqualByComparison_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeEqual.shouldNotBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertNotEqual_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertNotEqual_Test.java index a4c166425e..384ae01772 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertNotEqual_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bigintegers/BigIntegers_assertNotEqual_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeEqual.shouldNotBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsAnyOf_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsAnyOf_Test.java index 3f2c05e7fa..79356f6bc6 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsAnyOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsAnyOf_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal.booleanarrays; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsExactlyInAnyOrder_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsExactlyInAnyOrder_Test.java index e63b3f2597..533832ec5d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsExactlyInAnyOrder_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsExactlyInAnyOrder_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainExactlyInAnyOrder.shouldContainExactlyInAnyOrder; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.BooleanArrays.arrayOf; -import static org.assertj.core.test.BooleanArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsExactly_Test.java index bb668973ba..48a81968a4 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsExactly_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.error.ShouldContainExactly.elementsDifferAtIndex; import static org.assertj.core.error.ShouldContainExactly.shouldContainExactly; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.BooleanArrays.arrayOf; -import static org.assertj.core.test.BooleanArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.asList; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsOnlyOnce_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsOnlyOnce_Test.java index 6c83f402aa..167290a5dc 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsOnlyOnce_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsOnlyOnce_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainsOnlyOnce.shouldContainsOnlyOnce; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.BooleanArrays.arrayOf; -import static org.assertj.core.test.BooleanArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsOnly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsOnly_Test.java index ccb58131df..a4edfe2a75 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsOnly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsOnly_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainOnly.shouldContainOnly; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.BooleanArrays.arrayOf; -import static org.assertj.core.test.BooleanArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsSequence_Test.java index 6518cd5e09..6be3e5ca4a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsSequence_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainSequence.shouldContainSequence; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.BooleanArrays.arrayOf; -import static org.assertj.core.test.BooleanArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsSubsequence_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsSubsequence_Test.java index dd08112e19..ac81943de2 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsSubsequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContainsSubsequence_Test.java @@ -16,8 +16,8 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldContainSubsequence.shouldContainSubsequence; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.BooleanArrays.arrayOf; -import static org.assertj.core.test.BooleanArrays.emptyArray; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.emptyArray; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContains_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContains_Test.java index d469517cd5..0103d6fd1d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContains_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContains_Test.java @@ -12,8 +12,8 @@ */ package org.assertj.core.internal.booleanarrays; -import static org.assertj.core.test.BooleanArrays.arrayOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContains_at_Index_Test.java index 692e71416b..1ed77e9848 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertContains_at_Index_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldContainAtIndex.shouldContainAtIndex; -import static org.assertj.core.test.BooleanArrays.emptyArray; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.BooleanArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsEmpty; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertDoesNotContain_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertDoesNotContain_Test.java index a456320eea..b46b84781c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertDoesNotContain_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertDoesNotContain_Test.java @@ -20,9 +20,9 @@ import static org.assertj.core.error.ShouldNotContain.shouldNotContain; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsEmpty; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.BooleanArrays.arrayOf; -import static org.assertj.core.test.BooleanArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertDoesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertDoesNotContain_at_Index_Test.java index b309a585f6..e7d345aa34 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertDoesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertDoesNotContain_at_Index_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldNotContainAtIndex.shouldNotContainAtIndex; -import static org.assertj.core.test.BooleanArrays.emptyArray; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.BooleanArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertDoesNotHaveDuplicates_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertDoesNotHaveDuplicates_Test.java index 60e2fa9ef9..b1b1b1e455 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertDoesNotHaveDuplicates_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertDoesNotHaveDuplicates_Test.java @@ -16,9 +16,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotHaveDuplicates.shouldNotHaveDuplicates; -import static org.assertj.core.test.BooleanArrays.arrayOf; -import static org.assertj.core.test.BooleanArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertEmpty_Test.java index 18084e889b..46f7407978 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertEmpty_Test.java @@ -16,8 +16,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEmpty.shouldBeEmpty; -import static org.assertj.core.test.BooleanArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.BooleanArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertEndsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertEndsWith_Test.java index c91bc6205e..79c3942078 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertEndsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertEndsWith_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldEndWith.shouldEndWith; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.BooleanArrays.arrayOf; -import static org.assertj.core.test.BooleanArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSameSizeAs_with_Array_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSameSizeAs_with_Array_Test.java index 0af023e302..d5e97c045c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSameSizeAs_with_Array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSameSizeAs_with_Array_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.booleanarrays; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSameSizeAs_with_Iterable_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSameSizeAs_with_Iterable_Test.java index 0242452df7..b96b05ce8a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSameSizeAs_with_Iterable_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSameSizeAs_with_Iterable_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.booleanarrays; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.list; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSizeBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSizeBetween_Test.java index a928c3d511..25e78414fb 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSizeBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSizeBetween_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.error.ShouldHaveSizeBetween.shouldHaveSizeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.BooleanArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSizeGreaterThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSizeGreaterThanOrEqualTo_Test.java index a4e6e0089e..d8fd1a0433 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSizeGreaterThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSizeGreaterThanOrEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeGreaterThanOrEqualTo.shouldHaveSizeGreaterThanOrEqualTo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.BooleanArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSizeGreaterThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSizeGreaterThan_Test.java index 30ec4ff46c..fde0a585e1 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSizeGreaterThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSizeGreaterThan_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeGreaterThan.shouldHaveSizeGreaterThan; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.BooleanArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSizeLessThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSizeLessThanOrEqualTo_Test.java index 40daed00ba..a986ef8fc1 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSizeLessThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSizeLessThanOrEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeLessThanOrEqualTo.shouldHaveSizeLessThanOrEqualTo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.BooleanArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSizeLessThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSizeLessThan_Test.java index 8199db3f5e..fecec32e7f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSizeLessThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSizeLessThan_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeLessThan.shouldHaveSizeLessThan; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.BooleanArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSize_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSize_Test.java index 034625ff26..e821f07327 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSize_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertHasSize_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSize.shouldHaveSize; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertIsSortedAccordingToComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertIsSortedAccordingToComparator_Test.java index 4bd076a747..ccfa5b8026 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertIsSortedAccordingToComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertIsSortedAccordingToComparator_Test.java @@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeSorted.shouldBeSortedAccordingToGivenComparator; -import static org.assertj.core.test.BooleanArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.BooleanArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertIsSorted_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertIsSorted_Test.java index d585bb7037..f9f81a935f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertIsSorted_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertIsSorted_Test.java @@ -16,9 +16,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeSorted.shouldBeSorted; -import static org.assertj.core.test.BooleanArrays.arrayOf; -import static org.assertj.core.test.BooleanArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertNotEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertNotEmpty_Test.java index 52125cbb1c..91301a6a68 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertNotEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertNotEmpty_Test.java @@ -16,9 +16,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeEmpty.shouldNotBeEmpty; -import static org.assertj.core.test.BooleanArrays.arrayOf; -import static org.assertj.core.test.BooleanArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertNullOrEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertNullOrEmpty_Test.java index 479b5a892c..ae96ae387f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertNullOrEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertNullOrEmpty_Test.java @@ -15,8 +15,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeNullOrEmpty.shouldBeNullOrEmpty; -import static org.assertj.core.test.BooleanArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.BooleanArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertStartsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertStartsWith_Test.java index eb69f62fc8..e53c52f963 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertStartsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/booleanarrays/BooleanArrays_assertStartsWith_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldStartWith.shouldStartWith; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.BooleanArrays.arrayOf; -import static org.assertj.core.test.BooleanArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.BooleanArrays.arrayOf; +import static org.assertj.core.testkit.BooleanArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsAnyOf_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsAnyOf_Test.java index ab1e0e3384..78826009cc 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsAnyOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsAnyOf_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal.bytearrays; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsExactlyInAnyOrder_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsExactlyInAnyOrder_Test.java index 41a438c0ee..921695e30c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsExactlyInAnyOrder_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsExactlyInAnyOrder_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainExactlyInAnyOrder.shouldContainExactlyInAnyOrder; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ByteArrays.arrayOf; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsExactlyInAnyOrder_with_Integer_Arguments_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsExactlyInAnyOrder_with_Integer_Arguments_Test.java index aefd506567..91cf0d48c8 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsExactlyInAnyOrder_with_Integer_Arguments_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsExactlyInAnyOrder_with_Integer_Arguments_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainExactlyInAnyOrder.shouldContainExactlyInAnyOrder; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ByteArrays.arrayOf; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; @@ -30,7 +30,7 @@ import org.assertj.core.internal.ByteArrays; import org.assertj.core.internal.ByteArraysBaseTest; import org.assertj.core.internal.StandardComparisonStrategy; -import org.assertj.core.test.IntArrays; +import org.assertj.core.testkit.IntArrays; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsExactly_Test.java index bf0fbcc5c2..372d9339fa 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsExactly_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.error.ShouldContainExactly.elementsDifferAtIndex; import static org.assertj.core.error.ShouldContainExactly.shouldContainExactly; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ByteArrays.arrayOf; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.asList; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsExactly_with_Integer_Arguments_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsExactly_with_Integer_Arguments_Test.java index f03b507ecc..8bf992d9db 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsExactly_with_Integer_Arguments_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsExactly_with_Integer_Arguments_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.error.ShouldContainExactly.elementsDifferAtIndex; import static org.assertj.core.error.ShouldContainExactly.shouldContainExactly; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ByteArrays.arrayOf; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.asList; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; @@ -31,7 +31,7 @@ import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.ByteArrays; import org.assertj.core.internal.ByteArraysBaseTest; -import org.assertj.core.test.IntArrays; +import org.assertj.core.testkit.IntArrays; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsOnlyOnce_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsOnlyOnce_Test.java index 9b9ccc30a1..6f36a9d1cf 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsOnlyOnce_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsOnlyOnce_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainsOnlyOnce.shouldContainsOnlyOnce; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ByteArrays.arrayOf; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsOnlyOnce_with_Integer_Arguments_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsOnlyOnce_with_Integer_Arguments_Test.java index 5477c92959..c80597c3a4 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsOnlyOnce_with_Integer_Arguments_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsOnlyOnce_with_Integer_Arguments_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainsOnlyOnce.shouldContainsOnlyOnce; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ByteArrays.arrayOf; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; @@ -28,7 +28,7 @@ import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.ByteArrays; import org.assertj.core.internal.ByteArraysBaseTest; -import org.assertj.core.test.IntArrays; +import org.assertj.core.testkit.IntArrays; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsOnly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsOnly_Test.java index 6b59e34711..fceb064c72 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsOnly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsOnly_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainOnly.shouldContainOnly; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ByteArrays.arrayOf; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsOnly_with_Integer_Arguments_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsOnly_with_Integer_Arguments_Test.java index 464bfaf14f..0fc18d1068 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsOnly_with_Integer_Arguments_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsOnly_with_Integer_Arguments_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainOnly.shouldContainOnly; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ByteArrays.arrayOf; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; @@ -28,7 +28,7 @@ import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.ByteArrays; import org.assertj.core.internal.ByteArraysBaseTest; -import org.assertj.core.test.IntArrays; +import org.assertj.core.testkit.IntArrays; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsSequence_Test.java index af23b922c2..37306fcc82 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsSequence_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainSequence.shouldContainSequence; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ByteArrays.arrayOf; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsSequence_with_Integer_Arguments_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsSequence_with_Integer_Arguments_Test.java index 668c12a58b..612de33500 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsSequence_with_Integer_Arguments_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContainsSequence_with_Integer_Arguments_Test.java @@ -18,16 +18,16 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainSequence.shouldContainSequence; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ByteArrays.arrayOf; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.ByteArrays; import org.assertj.core.internal.ByteArraysBaseTest; -import org.assertj.core.test.IntArrays; +import org.assertj.core.testkit.IntArrays; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContains_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContains_Test.java index df608dd885..b945d773b4 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContains_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContains_Test.java @@ -12,8 +12,8 @@ */ package org.assertj.core.internal.bytearrays; -import static org.assertj.core.test.ByteArrays.arrayOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.arrayOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContains_at_Index_Test.java index 63994f5d55..8be5afb9ce 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContains_at_Index_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldContainAtIndex.shouldContainAtIndex; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsEmpty; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContains_at_Index_with_Integer_Argument_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContains_at_Index_with_Integer_Argument_Test.java index ed843760d5..59d45e5dd0 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContains_at_Index_with_Integer_Argument_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContains_at_Index_with_Integer_Argument_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldContainAtIndex.shouldContainAtIndex; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsEmpty; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContains_with_Integer_Arguments_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContains_with_Integer_Arguments_Test.java index 07f5d23bbf..175c7a60cd 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContains_with_Integer_Arguments_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertContains_with_Integer_Arguments_Test.java @@ -18,15 +18,15 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContain.shouldContain; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.ByteArraysBaseTest; -import org.assertj.core.test.ByteArrays; -import org.assertj.core.test.IntArrays; +import org.assertj.core.testkit.ByteArrays; +import org.assertj.core.testkit.IntArrays; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertDoesNotContain_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertDoesNotContain_Test.java index dab2ff0ebb..8d462683d3 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertDoesNotContain_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertDoesNotContain_Test.java @@ -20,9 +20,9 @@ import static org.assertj.core.error.ShouldNotContain.shouldNotContain; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsEmpty; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ByteArrays.arrayOf; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertDoesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertDoesNotContain_at_Index_Test.java index 7bf0ad3c8d..00b0613c56 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertDoesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertDoesNotContain_at_Index_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldNotContainAtIndex.shouldNotContainAtIndex; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertDoesNotContain_at_Index_with_Integer_Argument_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertDoesNotContain_at_Index_with_Integer_Argument_Test.java index ce2408f644..f9ff1c13c1 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertDoesNotContain_at_Index_with_Integer_Argument_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertDoesNotContain_at_Index_with_Integer_Argument_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldNotContainAtIndex.shouldNotContainAtIndex; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertDoesNotContain_with_Integer_Arguments_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertDoesNotContain_with_Integer_Arguments_Test.java index 7cde7e30b3..94d161c56f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertDoesNotContain_with_Integer_Arguments_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertDoesNotContain_with_Integer_Arguments_Test.java @@ -20,8 +20,8 @@ import static org.assertj.core.error.ShouldNotContain.shouldNotContain; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsEmpty; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ByteArrays.arrayOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.arrayOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; @@ -29,7 +29,7 @@ import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.ByteArrays; import org.assertj.core.internal.ByteArraysBaseTest; -import org.assertj.core.test.IntArrays; +import org.assertj.core.testkit.IntArrays; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertDoesNotHaveDuplicates_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertDoesNotHaveDuplicates_Test.java index c79651f58d..09f6d60315 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertDoesNotHaveDuplicates_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertDoesNotHaveDuplicates_Test.java @@ -16,9 +16,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotHaveDuplicates.shouldNotHaveDuplicates; -import static org.assertj.core.test.ByteArrays.arrayOf; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertEmpty_Test.java index 3f5bec6731..dc0b807f7b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertEmpty_Test.java @@ -16,8 +16,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEmpty.shouldBeEmpty; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertEndsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertEndsWith_Test.java index eab6a261c0..65020511e2 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertEndsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertEndsWith_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldEndWith.shouldEndWith; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ByteArrays.arrayOf; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertEndsWith_with_Integer_Arguments_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertEndsWith_with_Integer_Arguments_Test.java index 6e7be40afd..6769a5da00 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertEndsWith_with_Integer_Arguments_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertEndsWith_with_Integer_Arguments_Test.java @@ -18,16 +18,16 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldEndWith.shouldEndWith; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ByteArrays.arrayOf; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.ByteArrays; import org.assertj.core.internal.ByteArraysBaseTest; -import org.assertj.core.test.IntArrays; +import org.assertj.core.testkit.IntArrays; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSameSizeAs_with_Iterable_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSameSizeAs_with_Iterable_Test.java index 7f9c534107..1d0a118acf 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSameSizeAs_with_Iterable_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSameSizeAs_with_Iterable_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.bytearrays; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.list; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSizeBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSizeBetween_Test.java index 855b1b6574..8a34f950d4 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSizeBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSizeBetween_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.error.ShouldHaveSizeBetween.shouldHaveSizeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.ByteArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSizeGreaterThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSizeGreaterThanOrEqualTo_Test.java index fa49708003..68282f7839 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSizeGreaterThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSizeGreaterThanOrEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeGreaterThanOrEqualTo.shouldHaveSizeGreaterThanOrEqualTo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.ByteArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSizeGreaterThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSizeGreaterThan_Test.java index 0dd9e383e0..779e59a625 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSizeGreaterThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSizeGreaterThan_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeGreaterThan.shouldHaveSizeGreaterThan; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.ByteArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSizeLessThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSizeLessThanOrEqualTo_Test.java index ba1ea84da5..c69ce7e400 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSizeLessThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSizeLessThanOrEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeLessThanOrEqualTo.shouldHaveSizeLessThanOrEqualTo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.ByteArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSizeLessThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSizeLessThan_Test.java index 5d8bd2a8a5..0f9de37f41 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSizeLessThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSizeLessThan_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeLessThan.shouldHaveSizeLessThan; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.ByteArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSize_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSize_Test.java index c731eeb021..e1aebc949a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSize_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertHasSize_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSize.shouldHaveSize; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertIsSortedAccordingToComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertIsSortedAccordingToComparator_Test.java index 80b1f79447..2835544a4f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertIsSortedAccordingToComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertIsSortedAccordingToComparator_Test.java @@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeSorted.shouldBeSortedAccordingToGivenComparator; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertIsSorted_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertIsSorted_Test.java index 1acef68b16..2d3903d7b8 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertIsSorted_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertIsSorted_Test.java @@ -17,9 +17,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeSorted.shouldBeSorted; import static org.assertj.core.error.ShouldBeSorted.shouldBeSortedAccordingToGivenComparator; -import static org.assertj.core.test.ByteArrays.arrayOf; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertNotEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertNotEmpty_Test.java index ac7b28c1c9..6e8ed0edfd 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertNotEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertNotEmpty_Test.java @@ -16,9 +16,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeEmpty.shouldNotBeEmpty; -import static org.assertj.core.test.ByteArrays.arrayOf; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertNullOrEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertNullOrEmpty_Test.java index 6564b54764..3ebda3fd45 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertNullOrEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertNullOrEmpty_Test.java @@ -15,8 +15,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeNullOrEmpty.shouldBeNullOrEmpty; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertStartsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertStartsWith_Test.java index 657b947e10..7d7d64c4d9 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertStartsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertStartsWith_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldStartWith.shouldStartWith; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ByteArrays.arrayOf; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertStartsWith_with_Integer_Arguments_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertStartsWith_with_Integer_Arguments_Test.java index a9a42ce106..173458507e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertStartsWith_with_Integer_Arguments_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytearrays/ByteArrays_assertStartsWith_with_Integer_Arguments_Test.java @@ -18,16 +18,16 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldStartWith.shouldStartWith; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ByteArrays.arrayOf; -import static org.assertj.core.test.ByteArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ByteArrays.arrayOf; +import static org.assertj.core.testkit.ByteArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.ByteArrays; import org.assertj.core.internal.ByteArraysBaseTest; -import org.assertj.core.test.IntArrays; +import org.assertj.core.testkit.IntArrays; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertEqual_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertEqual_Test.java index d047f49808..584d643b5e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertEqual_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertEqual_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEqual.shouldBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertGreaterThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertGreaterThanOrEqualTo_Test.java index 43a73c080e..db3b2116a6 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertGreaterThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertGreaterThanOrEqualTo_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeGreaterOrEqual.shouldBeGreaterOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertGreaterThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertGreaterThan_Test.java index 519de1cc82..56d91eb024 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertGreaterThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertGreaterThan_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeGreater.shouldBeGreater; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsBetween_Test.java index d7b8d09e61..33d2e45151 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsBetween_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeBetween.shouldBeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsCloseToPercentage_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsCloseToPercentage_Test.java index 4f8784fa99..c722cceb05 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsCloseToPercentage_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsCloseToPercentage_Test.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.withinPercentage; import static org.assertj.core.data.Percentage.withPercentage; import static org.assertj.core.error.ShouldBeEqualWithinPercentage.shouldBeEqualWithinPercentage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsCloseTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsCloseTo_Test.java index 0b388dd614..a05c1a15a5 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsCloseTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsCloseTo_Test.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.Assertions.within; import static org.assertj.core.error.ShouldNotBeEqualWithinOffset.shouldNotBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsEven_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsEven_Test.java index cc1aed523f..8370c60ed1 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsEven_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsEven_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeEven.shouldBeEven; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsNegative_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsNegative_Test.java index 29b9f49f7c..3a7e1b491d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsNegative_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsNegative_Test.java @@ -14,8 +14,8 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeLess.shouldBeLess; -import static org.assertj.core.test.TestData.someHexInfo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someHexInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsNotCloseToPercentage_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsNotCloseToPercentage_Test.java index 6fcbf6812b..3bfbe52c1a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsNotCloseToPercentage_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsNotCloseToPercentage_Test.java @@ -21,7 +21,7 @@ import static org.assertj.core.api.Assertions.withinPercentage; import static org.assertj.core.data.Percentage.withPercentage; import static org.assertj.core.error.ShouldNotBeEqualWithinPercentage.shouldNotBeEqualWithinPercentage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsNotCloseTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsNotCloseTo_Test.java index 820571f904..fb5c70cbfa 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsNotCloseTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsNotCloseTo_Test.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.Assertions.within; import static org.assertj.core.error.ShouldNotBeEqualWithinOffset.shouldNotBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsNotNegative_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsNotNegative_Test.java index 95b7977829..90b445c4fc 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsNotNegative_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsNotNegative_Test.java @@ -14,8 +14,8 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someHexInfo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someHexInfo; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.internal.BytesBaseTest; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsNotPositive_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsNotPositive_Test.java index 7296d68205..b6475445ba 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsNotPositive_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsNotPositive_Test.java @@ -14,8 +14,8 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeLessOrEqual.shouldBeLessOrEqual; -import static org.assertj.core.test.TestData.someHexInfo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someHexInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsNotZero_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsNotZero_Test.java index ed954189a6..b597b9234c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsNotZero_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsNotZero_Test.java @@ -14,8 +14,8 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someHexInfo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someHexInfo; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Bytes; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsOdd_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsOdd_Test.java index 0e0ab4cad7..a027d9907d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsOdd_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsOdd_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeOdd.shouldBeOdd; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsOne_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsOne_Test.java index 8a5b93b400..c3dec370b6 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsOne_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsOne_Test.java @@ -13,9 +13,9 @@ package org.assertj.core.internal.bytes; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; -import static org.assertj.core.test.TestData.someHexInfo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.TestData.someHexInfo; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Bytes; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsPositive_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsPositive_Test.java index 158001e5ff..d64da669e6 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsPositive_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsPositive_Test.java @@ -14,8 +14,8 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someHexInfo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someHexInfo; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Bytes; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsStrictlyBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsStrictlyBetween_Test.java index cf3ee79062..44f264b2a1 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsStrictlyBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsStrictlyBetween_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeBetween.shouldBeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsZero_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsZero_Test.java index f84b8750b6..de7907043a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsZero_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertIsZero_Test.java @@ -13,9 +13,9 @@ package org.assertj.core.internal.bytes; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; -import static org.assertj.core.test.TestData.someHexInfo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.TestData.someHexInfo; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Bytes; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertLessThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertLessThanOrEqualTo_Test.java index 4458e1ffda..fc0dbdf22e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertLessThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertLessThanOrEqualTo_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeLessOrEqual.shouldBeLessOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertLessThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertLessThan_Test.java index 051ece8cb2..ac58d2fb36 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertLessThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertLessThan_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeLess.shouldBeLess; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertNotEqual_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertNotEqual_Test.java index 5e8f554620..e378e8d7bf 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertNotEqual_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/bytes/Bytes_assertNotEqual_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeEqual.shouldNotBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/char2darrays/Char2DArrays_assertEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/char2darrays/Char2DArrays_assertEmpty_Test.java index 9ad6d74399..5066628bff 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/char2darrays/Char2DArrays_assertEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/char2darrays/Char2DArrays_assertEmpty_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal.char2darrays; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/char2darrays/Char2DArrays_assertNotEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/char2darrays/Char2DArrays_assertNotEmpty_Test.java index c1c0d824b8..80e63fe793 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/char2darrays/Char2DArrays_assertNotEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/char2darrays/Char2DArrays_assertNotEmpty_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal.char2darrays; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/char2darrays/Char2DArrays_assertNullOrEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/char2darrays/Char2DArrays_assertNullOrEmpty_Test.java index 123a72dea9..de8007a13c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/char2darrays/Char2DArrays_assertNullOrEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/char2darrays/Char2DArrays_assertNullOrEmpty_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal.char2darrays; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertEqual_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertEqual_Test.java index fbddd02c6f..107a014371 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertEqual_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertEqual_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEqual.shouldBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertGreaterThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertGreaterThanOrEqualTo_Test.java index 6f6e17b968..adee41ed62 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertGreaterThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertGreaterThanOrEqualTo_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeGreaterOrEqual.shouldBeGreaterOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertGreaterThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertGreaterThan_Test.java index f7ec19fd23..b2fbd1ac66 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertGreaterThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertGreaterThan_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeGreater.shouldBeGreater; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertLessThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertLessThanOrEqualTo_Test.java index d1a6f92603..12bd38e7ca 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertLessThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertLessThanOrEqualTo_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeLessOrEqual.shouldBeLessOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertLessThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertLessThan_Test.java index a133e638e8..33523d972c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertLessThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertLessThan_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeLess.shouldBeLess; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertLowerCase_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertLowerCase_Test.java index fd0c97de6c..ef25c1f6e7 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertLowerCase_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertLowerCase_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeLowerCase.shouldBeLowerCase; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertNotEqual_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertNotEqual_Test.java index 1d66c4b8be..4cf3aace10 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertNotEqual_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertNotEqual_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeEqual.shouldNotBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertUpperCase_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertUpperCase_Test.java index 6e01361156..993f7b525e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertUpperCase_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/characters/Characters_assertUpperCase_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeUpperCase.shouldBeUpperCase; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContainsAnyOf_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContainsAnyOf_Test.java index 649c8d18d8..43a4d02c2b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContainsAnyOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContainsAnyOf_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal.chararrays; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContainsExactlyInAnyOrder_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContainsExactlyInAnyOrder_Test.java index 08e27e1398..bfe34b2cb6 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContainsExactlyInAnyOrder_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContainsExactlyInAnyOrder_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainExactlyInAnyOrder.shouldContainExactlyInAnyOrder; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.CharArrays.arrayOf; -import static org.assertj.core.test.CharArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContainsExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContainsExactly_Test.java index 7482b24a8b..79e2bfb286 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContainsExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContainsExactly_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.error.ShouldContainExactly.elementsDifferAtIndex; import static org.assertj.core.error.ShouldContainExactly.shouldContainExactly; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.CharArrays.arrayOf; -import static org.assertj.core.test.CharArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.asList; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContainsOnlyOnce_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContainsOnlyOnce_Test.java index 57d55ec357..8d9dc9d582 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContainsOnlyOnce_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContainsOnlyOnce_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainsOnlyOnce.shouldContainsOnlyOnce; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.CharArrays.arrayOf; -import static org.assertj.core.test.CharArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContainsOnly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContainsOnly_Test.java index 20fe76b275..0f566b13c6 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContainsOnly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContainsOnly_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainOnly.shouldContainOnly; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.CharArrays.arrayOf; -import static org.assertj.core.test.CharArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContainsSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContainsSequence_Test.java index d908aeadd4..3391d418c3 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContainsSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContainsSequence_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainSequence.shouldContainSequence; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.CharArrays.arrayOf; -import static org.assertj.core.test.CharArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContains_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContains_Test.java index d847190890..046a429e25 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContains_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContains_Test.java @@ -12,8 +12,8 @@ */ package org.assertj.core.internal.chararrays; -import static org.assertj.core.test.CharArrays.arrayOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.CharArrays.arrayOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContains_at_Index_Test.java index 262fb548a4..3de9e58d3c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertContains_at_Index_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldContainAtIndex.shouldContainAtIndex; -import static org.assertj.core.test.CharArrays.emptyArray; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.CharArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsEmpty; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertDoesNotContain_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertDoesNotContain_Test.java index b74fc0fbd6..dc05fafd5b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertDoesNotContain_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertDoesNotContain_Test.java @@ -20,9 +20,9 @@ import static org.assertj.core.error.ShouldNotContain.shouldNotContain; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsEmpty; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.CharArrays.arrayOf; -import static org.assertj.core.test.CharArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertDoesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertDoesNotContain_at_Index_Test.java index 45ef03fc77..ae9574e218 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertDoesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertDoesNotContain_at_Index_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldNotContainAtIndex.shouldNotContainAtIndex; -import static org.assertj.core.test.CharArrays.emptyArray; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.CharArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertDoesNotHaveDuplicates_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertDoesNotHaveDuplicates_Test.java index cdd91cb324..9f1c0da367 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertDoesNotHaveDuplicates_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertDoesNotHaveDuplicates_Test.java @@ -16,9 +16,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotHaveDuplicates.shouldNotHaveDuplicates; -import static org.assertj.core.test.CharArrays.arrayOf; -import static org.assertj.core.test.CharArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertEmpty_Test.java index 127905b881..b01baecc44 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertEmpty_Test.java @@ -16,8 +16,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEmpty.shouldBeEmpty; -import static org.assertj.core.test.CharArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.CharArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertEndsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertEndsWith_Test.java index c1b354a6cd..7d13aab5dc 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertEndsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertEndsWith_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldEndWith.shouldEndWith; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.CharArrays.arrayOf; -import static org.assertj.core.test.CharArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSameSizeAs_with_Array_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSameSizeAs_with_Array_Test.java index 6714af9129..98ecb6947d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSameSizeAs_with_Array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSameSizeAs_with_Array_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.chararrays; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSameSizeAs_with_Iterable_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSameSizeAs_with_Iterable_Test.java index 5d17912107..dc2e519e3b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSameSizeAs_with_Iterable_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSameSizeAs_with_Iterable_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.chararrays; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.list; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSizeBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSizeBetween_Test.java index c7f793870c..66e1c8f0f6 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSizeBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSizeBetween_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.error.ShouldHaveSizeBetween.shouldHaveSizeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.CharArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSizeGreaterThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSizeGreaterThanOrEqualTo_Test.java index 2a15483d5c..5dd5e5e03b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSizeGreaterThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSizeGreaterThanOrEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeGreaterThanOrEqualTo.shouldHaveSizeGreaterThanOrEqualTo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.CharArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSizeGreaterThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSizeGreaterThan_Test.java index e9326b8770..a3e5e88106 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSizeGreaterThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSizeGreaterThan_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeGreaterThan.shouldHaveSizeGreaterThan; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.CharArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSizeLessThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSizeLessThanOrEqualTo_Test.java index 4228467132..6535b84425 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSizeLessThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSizeLessThanOrEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeLessThanOrEqualTo.shouldHaveSizeLessThanOrEqualTo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.CharArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSizeLessThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSizeLessThan_Test.java index 24cc31c978..f1df6c2414 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSizeLessThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSizeLessThan_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeLessThan.shouldHaveSizeLessThan; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.CharArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSize_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSize_Test.java index 52a1c9b0f7..b4ea922f69 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSize_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertHasSize_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSize.shouldHaveSize; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertIsSortedAccordingToComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertIsSortedAccordingToComparator_Test.java index b41a5fd91a..22cd547027 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertIsSortedAccordingToComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertIsSortedAccordingToComparator_Test.java @@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeSorted.shouldBeSortedAccordingToGivenComparator; -import static org.assertj.core.test.CharArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.CharArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertIsSorted_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertIsSorted_Test.java index 93251d5490..6018391350 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertIsSorted_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertIsSorted_Test.java @@ -17,9 +17,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeSorted.shouldBeSorted; import static org.assertj.core.error.ShouldBeSorted.shouldBeSortedAccordingToGivenComparator; -import static org.assertj.core.test.CharArrays.arrayOf; -import static org.assertj.core.test.CharArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertNotEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertNotEmpty_Test.java index d3d0b3d00f..32d9edfda6 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertNotEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertNotEmpty_Test.java @@ -16,9 +16,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeEmpty.shouldNotBeEmpty; -import static org.assertj.core.test.CharArrays.arrayOf; -import static org.assertj.core.test.CharArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertNullOrEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertNullOrEmpty_Test.java index 6748cdfe0b..7ea0bcf811 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertNullOrEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertNullOrEmpty_Test.java @@ -15,8 +15,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeNullOrEmpty.shouldBeNullOrEmpty; -import static org.assertj.core.test.CharArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.CharArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertStartsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertStartsWith_Test.java index eac0f18578..fd1e954f28 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertStartsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/chararrays/CharArrays_assertStartsWith_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldStartWith.shouldStartWith; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.CharArrays.arrayOf; -import static org.assertj.core.test.CharArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.CharArrays.arrayOf; +import static org.assertj.core.testkit.CharArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertContainsAnnotation_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertContainsAnnotation_Test.java index 3fa345cba0..97e710636f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertContainsAnnotation_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertContainsAnnotation_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldHaveAnnotations.shouldHaveAnnotations; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasDeclaredFields_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasDeclaredFields_Test.java index 98eef7d8ab..75d98c9718 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasDeclaredFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasDeclaredFields_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveFields.shouldHaveDeclaredFields; import static org.assertj.core.error.ShouldHaveNoFields.shouldHaveNoDeclaredFields; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasDeclaredMethods_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasDeclaredMethods_Test.java index e56904d7ac..b240cdb08b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasDeclaredMethods_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasDeclaredMethods_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveMethods.shouldHaveMethods; import static org.assertj.core.error.ShouldHaveMethods.shouldNotHaveMethods; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newTreeSet; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasMethods_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasMethods_Test.java index 315e90e3c5..e514f8c86e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasMethods_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasMethods_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldHaveMethods.shouldHaveMethods; import static org.assertj.core.error.ShouldHaveMethods.shouldNotHaveMethods; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasOnlyDeclaredFields_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasOnlyDeclaredFields_Test.java index c85b423bc5..abb4483f5b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasOnlyDeclaredFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasOnlyDeclaredFields_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveNoFields.shouldHaveNoDeclaredFields; import static org.assertj.core.error.ShouldOnlyHaveFields.shouldOnlyHaveDeclaredFields; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasOnlyPublicFields_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasOnlyPublicFields_Test.java index 362343de0e..7ff64d03ac 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasOnlyPublicFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasOnlyPublicFields_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveNoFields.shouldHaveNoPublicFields; import static org.assertj.core.error.ShouldOnlyHaveFields.shouldOnlyHaveFields; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasPublicFields_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasPublicFields_Test.java index 45fe61125d..71f3d80b50 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasPublicFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasPublicFields_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveFields.shouldHaveFields; import static org.assertj.core.error.ShouldHaveNoFields.shouldHaveNoPublicFields; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasPublicMethods_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasPublicMethods_Test.java index e1ce87f9eb..b8f2a9fca6 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasPublicMethods_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertHasPublicMethods_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveMethods.shouldHaveMethods; import static org.assertj.core.error.ShouldHaveMethods.shouldNotHaveMethods; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newTreeSet; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertIsAssignableFrom_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertIsAssignableFrom_Test.java index 49571904bc..694bead483 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertIsAssignableFrom_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/classes/Classes_assertIsAssignableFrom_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.error.ShouldBeAssignableFrom.shouldBeAssignableFrom; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.ClassesBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_assertEqualByComparison_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_assertEqualByComparison_Test.java index 1b88ae67a1..3b1e1c2ed8 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_assertEqualByComparison_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_assertEqualByComparison_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEqual.shouldBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_assertGreaterThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_assertGreaterThanOrEqualTo_Test.java index 8f5567a2d9..a5d293395c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_assertGreaterThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_assertGreaterThanOrEqualTo_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeGreaterOrEqual.shouldBeGreaterOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_assertGreaterThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_assertGreaterThan_Test.java index 206b310941..0db1e7dc1b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_assertGreaterThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_assertGreaterThan_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeGreater.shouldBeGreater; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_assertLessThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_assertLessThanOrEqualTo_Test.java index 9ad10c9cce..13879d0b6c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_assertLessThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_assertLessThanOrEqualTo_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeLessOrEqual.shouldBeLessOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_assertLessThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_assertLessThan_Test.java index 5527524ae6..4c813171f8 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_assertLessThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_assertLessThan_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeLess.shouldBeLess; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_assertNotEqualByComparison_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_assertNotEqualByComparison_Test.java index 9e06cbf30f..eac5e6d7fd 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_assertNotEqualByComparison_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_assertNotEqualByComparison_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeEqual.shouldNotBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -26,8 +26,8 @@ import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Comparables; import org.assertj.core.internal.ComparablesBaseTest; -import org.assertj.core.test.Person; -import org.assertj.core.test.PersonCaseInsensitiveNameComparator; +import org.assertj.core.testkit.Person; +import org.assertj.core.testkit.PersonCaseInsensitiveNameComparator; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_isBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_isBetween_Test.java index 2e14b2b571..710f60cc0f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_isBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_isBetween_Test.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeBetween.shouldBeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_isStrictlyBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_isStrictlyBetween_Test.java index 7822f3bec6..a08f135672 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_isStrictlyBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/comparables/Comparables_isStrictlyBetween_Test.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeBetween.shouldBeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/conditions/Conditions_assertDoesNotHave_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/conditions/Conditions_assertDoesNotHave_Test.java index b12d7ba78a..7ef405a501 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/conditions/Conditions_assertDoesNotHave_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/conditions/Conditions_assertDoesNotHave_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotHave.shouldNotHave; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/conditions/Conditions_assertHas_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/conditions/Conditions_assertHas_Test.java index eb6d504c0c..7296cfe7fe 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/conditions/Conditions_assertHas_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/conditions/Conditions_assertHas_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldHave.shouldHave; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/conditions/Conditions_assertIsNot_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/conditions/Conditions_assertIsNot_Test.java index 74103fa127..949fa80da3 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/conditions/Conditions_assertIsNot_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/conditions/Conditions_assertIsNot_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBe.shouldNotBe; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/conditions/Conditions_assertIs_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/conditions/Conditions_assertIs_Test.java index 6291f8916a..c9cf579456 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/conditions/Conditions_assertIs_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/conditions/Conditions_assertIs_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBe.shouldBe; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasDayOfMonth_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasDayOfMonth_Test.java index d9534bb097..a9c9502222 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasDayOfMonth_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasDayOfMonth_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldHaveDateField.shouldHaveDateField; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasDayOfWeek_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasDayOfWeek_Test.java index 9f57c1c28f..99c276c648 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasDayOfWeek_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasDayOfWeek_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldHaveDateField.shouldHaveDateField; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasHourOfDay_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasHourOfDay_Test.java index 1fb0aaa6da..256beaf6d0 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasHourOfDay_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasHourOfDay_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldHaveDateField.shouldHaveDateField; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasMillisecond_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasMillisecond_Test.java index 73acc5080e..a85d0e749c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasMillisecond_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasMillisecond_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldHaveDateField.shouldHaveDateField; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasMinute_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasMinute_Test.java index dc40d767a5..b3b24492d2 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasMinute_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasMinute_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldHaveDateField.shouldHaveDateField; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasMonth_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasMonth_Test.java index 74defa8dab..064212a591 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasMonth_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasMonth_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldHaveDateField.shouldHaveDateField; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasSecond_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasSecond_Test.java index 87bf6fd22e..e47d38c1e6 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasSecond_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasSecond_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldHaveDateField.shouldHaveDateField; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasTime_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasTime_Test.java index 5039d9e839..e3c6fdb8bf 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasTime_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasTime_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldHaveTime.shouldHaveTime; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasYear_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasYear_Test.java index 8918255c0c..fdfa2587b9 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasYear_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertHasYear_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldHaveDateField.shouldHaveDateField; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsAfterOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsAfterOrEqualTo_Test.java index 7000f4c12d..cb68adf8b5 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsAfterOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsAfterOrEqualTo_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeAfterOrEqualTo.shouldBeAfterOrEqualTo; import static org.assertj.core.internal.ErrorMessages.dateToCompareActualWithIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsAfterYear_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsAfterYear_Test.java index c3a869fdd7..6080bed0d9 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsAfterYear_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsAfterYear_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeAfterYear.shouldBeAfterYear; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsAfter_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsAfter_Test.java index 701364c985..41c48636fc 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsAfter_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsAfter_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeAfter.shouldBeAfter; import static org.assertj.core.internal.ErrorMessages.dateToCompareActualWithIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsBeforeOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsBeforeOrEqualTo_Test.java index 9a203e3a5a..7cdf5f23a4 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsBeforeOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsBeforeOrEqualTo_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeBeforeOrEqualTo.shouldBeBeforeOrEqualTo; import static org.assertj.core.internal.ErrorMessages.dateToCompareActualWithIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsBeforeYear_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsBeforeYear_Test.java index 40aa185cd7..7f2ca8691d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsBeforeYear_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsBeforeYear_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeBeforeYear.shouldBeBeforeYear; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsBefore_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsBefore_Test.java index cc53cfba16..ff70267cf3 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsBefore_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsBefore_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeBefore.shouldBeBefore; import static org.assertj.core.internal.ErrorMessages.dateToCompareActualWithIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsBetween_Test.java index 3c7c6c054f..8e901478ab 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsBetween_Test.java @@ -19,7 +19,7 @@ import static org.assertj.core.error.ShouldBeBetween.shouldBeBetween; import static org.assertj.core.internal.ErrorMessages.endDateToCompareActualWithIsNull; import static org.assertj.core.internal.ErrorMessages.startDateToCompareActualWithIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsCloseTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsCloseTo_Test.java index e649e15c8c..6e53a6fe31 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsCloseTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsCloseTo_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeCloseTo.shouldBeCloseTo; import static org.assertj.core.internal.ErrorMessages.dateToCompareActualWithIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsEqualWithPrecision_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsEqualWithPrecision_Test.java index 0bc1d99aea..bed77b9988 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsEqualWithPrecision_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsEqualWithPrecision_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEqualWithTimePrecision.shouldBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import java.util.Calendar; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameDayAs_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameDayAs_Test.java index c2e390bf69..b3ef3da087 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameDayAs_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameDayAs_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeInSameDay.shouldBeInSameDay; import static org.assertj.core.internal.ErrorMessages.dateToCompareActualWithIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameHourAs_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameHourAs_Test.java index a0ec4b1a24..a69eff8c20 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameHourAs_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameHourAs_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeInSameHour.shouldBeInSameHour; import static org.assertj.core.internal.ErrorMessages.dateToCompareActualWithIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameHourWindowAs_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameHourWindowAs_Test.java index 44699722de..ba21897e3d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameHourWindowAs_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameHourWindowAs_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeInSameHourWindow.shouldBeInSameHourWindow; import static org.assertj.core.internal.ErrorMessages.dateToCompareActualWithIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameMinuteAs_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameMinuteAs_Test.java index 7d22120df5..a3f0a67d33 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameMinuteAs_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameMinuteAs_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeInSameMinute.shouldBeInSameMinute; import static org.assertj.core.internal.ErrorMessages.dateToCompareActualWithIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameMinuteWindowAs_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameMinuteWindowAs_Test.java index bf8a8861ab..be9ce50080 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameMinuteWindowAs_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameMinuteWindowAs_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeInSameMinuteWindow.shouldBeInSameMinuteWindow; import static org.assertj.core.internal.ErrorMessages.dateToCompareActualWithIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameMonthAs_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameMonthAs_Test.java index efb22cd374..db1349550f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameMonthAs_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameMonthAs_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeInSameMonth.shouldBeInSameMonth; import static org.assertj.core.internal.ErrorMessages.dateToCompareActualWithIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameSecondAs_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameSecondAs_Test.java index fa78a595a3..0d2a3fd7fe 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameSecondAs_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameSecondAs_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeInSameSecond.shouldBeInSameSecond; import static org.assertj.core.internal.ErrorMessages.dateToCompareActualWithIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameSecondWindowAs_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameSecondWindowAs_Test.java index c6a7b4c7aa..3d8ad05ad1 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameSecondWindowAs_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameSecondWindowAs_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeInSameSecondWindow.shouldBeInSameSecondWindow; import static org.assertj.core.internal.ErrorMessages.dateToCompareActualWithIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameYearAs_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameYearAs_Test.java index 0e234b7c0d..df9b29ffb6 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameYearAs_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInSameYearAs_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeInSameYear.shouldBeInSameYear; import static org.assertj.core.internal.ErrorMessages.dateToCompareActualWithIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInTheFuture_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInTheFuture_Test.java index 6ba46e3369..0637e10cd6 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInTheFuture_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInTheFuture_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeInTheFuture.shouldBeInTheFuture; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.DateUtil.monthOf; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInThePast_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInThePast_Test.java index 4709192f13..d66363b7c2 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInThePast_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsInThePast_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeInThePast.shouldBeInThePast; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.DateUtil.monthOf; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsNotBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsNotBetween_Test.java index fea29f575c..79771e2cbf 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsNotBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsNotBetween_Test.java @@ -19,7 +19,7 @@ import static org.assertj.core.error.ShouldNotBeBetween.shouldNotBeBetween; import static org.assertj.core.internal.ErrorMessages.endDateToCompareActualWithIsNull; import static org.assertj.core.internal.ErrorMessages.startDateToCompareActualWithIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsToday_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsToday_Test.java index 04b012734f..bc1e1640e5 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsToday_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_assertIsToday_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeToday.shouldBeToday; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.DateUtil.monthOf; import static org.assertj.core.util.DateUtil.tomorrow; import static org.assertj.core.util.DateUtil.yesterday; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_hasSameTimeAs_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_hasSameTimeAs_Test.java index 31439e3742..29621166b8 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_hasSameTimeAs_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/dates/Dates_hasSameTimeAs_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldHaveSameTime.shouldHaveSameTime; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContainsAnyOf_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContainsAnyOf_Test.java index 9c54e31e80..ed88248b98 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContainsAnyOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContainsAnyOf_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal.doublearrays; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContainsExactlyInAnyOrder_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContainsExactlyInAnyOrder_Test.java index a307f9ba0e..ab8c08fb2a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContainsExactlyInAnyOrder_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContainsExactlyInAnyOrder_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldContainExactlyInAnyOrder.shouldContainExactlyInAnyOrder; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.DoubleArrays.arrayOf; -import static org.assertj.core.test.DoubleArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContainsExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContainsExactly_Test.java index 388f901455..81bc9d6580 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContainsExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContainsExactly_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.error.ShouldContainExactly.elementsDifferAtIndex; import static org.assertj.core.error.ShouldContainExactly.shouldContainExactly; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.DoubleArrays.arrayOf; -import static org.assertj.core.test.DoubleArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.asList; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContainsOnlyOnce_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContainsOnlyOnce_Test.java index 603b1d047a..9936b34030 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContainsOnlyOnce_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContainsOnlyOnce_Test.java @@ -17,9 +17,9 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldContainsOnlyOnce.shouldContainsOnlyOnce; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.DoubleArrays.arrayOf; -import static org.assertj.core.test.DoubleArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContainsOnly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContainsOnly_Test.java index d2581e65f2..711d139111 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContainsOnly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContainsOnly_Test.java @@ -17,9 +17,9 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldContainOnly.shouldContainOnly; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.DoubleArrays.arrayOf; -import static org.assertj.core.test.DoubleArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContainsSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContainsSequence_Test.java index ce0bf14142..e6c2a4a4f8 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContainsSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContainsSequence_Test.java @@ -16,9 +16,9 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldContainSequence.shouldContainSequence; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.DoubleArrays.arrayOf; -import static org.assertj.core.test.DoubleArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContains_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContains_Test.java index cda0742426..f942ed4d59 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContains_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContains_Test.java @@ -12,8 +12,8 @@ */ package org.assertj.core.internal.doublearrays; -import static org.assertj.core.test.DoubleArrays.arrayOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContains_at_Index_Test.java index e1dba3cf7f..94a5690aad 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertContains_at_Index_Test.java @@ -17,9 +17,9 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldContainAtIndex.shouldContainAtIndex; -import static org.assertj.core.test.DoubleArrays.emptyArray; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.DoubleArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsEmpty; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertDoesNotContain_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertDoesNotContain_Test.java index 0d0c98370c..f6e15685a3 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertDoesNotContain_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertDoesNotContain_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.error.ShouldNotContain.shouldNotContain; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsEmpty; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.DoubleArrays.arrayOf; -import static org.assertj.core.test.DoubleArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertDoesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertDoesNotContain_at_Index_Test.java index 0da20faf06..225c115be8 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertDoesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertDoesNotContain_at_Index_Test.java @@ -16,9 +16,9 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldNotContainAtIndex.shouldNotContainAtIndex; -import static org.assertj.core.test.DoubleArrays.emptyArray; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.DoubleArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertDoesNotHaveDuplicates_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertDoesNotHaveDuplicates_Test.java index 710b800117..ad652d0762 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertDoesNotHaveDuplicates_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertDoesNotHaveDuplicates_Test.java @@ -14,9 +14,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldNotHaveDuplicates.shouldNotHaveDuplicates; -import static org.assertj.core.test.DoubleArrays.arrayOf; -import static org.assertj.core.test.DoubleArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertEmpty_Test.java index 5c49d548e1..b2b1d6b5ae 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertEmpty_Test.java @@ -14,8 +14,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldBeEmpty.shouldBeEmpty; -import static org.assertj.core.test.DoubleArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.DoubleArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertEndsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertEndsWith_Test.java index 0557c33dc1..bb30112d1f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertEndsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertEndsWith_Test.java @@ -16,9 +16,9 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldEndWith.shouldEndWith; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.DoubleArrays.arrayOf; -import static org.assertj.core.test.DoubleArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSameSizeAs_with_Array_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSameSizeAs_with_Array_Test.java index 2c5e56f579..3782b0e607 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSameSizeAs_with_Array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSameSizeAs_with_Array_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.doublearrays; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSameSizeAs_with_Iterable_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSameSizeAs_with_Iterable_Test.java index aa7ecd54d7..341b7e38d5 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSameSizeAs_with_Iterable_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSameSizeAs_with_Iterable_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.doublearrays; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.list; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSizeBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSizeBetween_Test.java index 3ad24ab0a4..0eecf5f2f5 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSizeBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSizeBetween_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.error.ShouldHaveSizeBetween.shouldHaveSizeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.DoubleArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSizeGreaterThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSizeGreaterThanOrEqualTo_Test.java index 351bfa16b1..47f387efd7 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSizeGreaterThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSizeGreaterThanOrEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeGreaterThanOrEqualTo.shouldHaveSizeGreaterThanOrEqualTo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.DoubleArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSizeGreaterThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSizeGreaterThan_Test.java index 7dd8203113..35e5359450 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSizeGreaterThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSizeGreaterThan_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeGreaterThan.shouldHaveSizeGreaterThan; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.DoubleArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSizeLessThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSizeLessThanOrEqualTo_Test.java index fa49adb4ff..d2fdbdfb9e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSizeLessThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSizeLessThanOrEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeLessThanOrEqualTo.shouldHaveSizeLessThanOrEqualTo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.DoubleArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSizeLessThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSizeLessThan_Test.java index 714ddc0f3e..ed4a120c1b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSizeLessThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSizeLessThan_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeLessThan.shouldHaveSizeLessThan; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.DoubleArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSize_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSize_Test.java index 4b73c5fdd5..cb75166ee5 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSize_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertHasSize_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSize.shouldHaveSize; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertIsSortedAccordingToComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertIsSortedAccordingToComparator_Test.java index 72af6cb05a..458ba7351b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertIsSortedAccordingToComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertIsSortedAccordingToComparator_Test.java @@ -15,8 +15,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldBeSorted.shouldBeSortedAccordingToGivenComparator; -import static org.assertj.core.test.DoubleArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.DoubleArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertIsSorted_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertIsSorted_Test.java index 6823bd4a33..b2c6fd91c8 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertIsSorted_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertIsSorted_Test.java @@ -15,9 +15,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldBeSorted.shouldBeSorted; import static org.assertj.core.error.ShouldBeSorted.shouldBeSortedAccordingToGivenComparator; -import static org.assertj.core.test.DoubleArrays.arrayOf; -import static org.assertj.core.test.DoubleArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertNotEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertNotEmpty_Test.java index b63ca182df..553cc8a830 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertNotEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertNotEmpty_Test.java @@ -14,9 +14,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldNotBeEmpty.shouldNotBeEmpty; -import static org.assertj.core.test.DoubleArrays.arrayOf; -import static org.assertj.core.test.DoubleArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertNullOrEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertNullOrEmpty_Test.java index fed8b56a76..4d657dba69 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertNullOrEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertNullOrEmpty_Test.java @@ -14,8 +14,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldBeNullOrEmpty.shouldBeNullOrEmpty; -import static org.assertj.core.test.DoubleArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.DoubleArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.DoubleArrays; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertStartsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertStartsWith_Test.java index 69abbd9de1..8ae4595c5a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertStartsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doublearrays/DoubleArrays_assertStartsWith_Test.java @@ -16,9 +16,9 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldStartWith.shouldStartWith; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.DoubleArrays.arrayOf; -import static org.assertj.core.test.DoubleArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.DoubleArrays.arrayOf; +import static org.assertj.core.testkit.DoubleArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertEqual_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertEqual_Test.java index bd9833b993..e0d452bce3 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertEqual_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertEqual_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEqual.shouldBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertGreaterThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertGreaterThanOrEqualTo_Test.java index 0de9b9c480..79622e3532 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertGreaterThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertGreaterThanOrEqualTo_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeGreaterOrEqual.shouldBeGreaterOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertGreaterThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertGreaterThan_Test.java index a27b04e584..a1f2e4a10d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertGreaterThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertGreaterThan_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeGreater.shouldBeGreater; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsBetween_Test.java index 8f139aa7ca..7e604d8456 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsBetween_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeBetween.shouldBeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsCloseToPercentage_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsCloseToPercentage_Test.java index f309d5ebcb..1b401e054d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsCloseToPercentage_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsCloseToPercentage_Test.java @@ -23,7 +23,7 @@ import static org.assertj.core.api.Assertions.withinPercentage; import static org.assertj.core.data.Percentage.withPercentage; import static org.assertj.core.error.ShouldBeEqualWithinPercentage.shouldBeEqualWithinPercentage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsFinite_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsFinite_Test.java index e04c344483..5f2d766852 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsFinite_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsFinite_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeFinite.shouldBeFinite; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsInfinite_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsInfinite_Test.java index 8d34a533b6..2651a05dd0 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsInfinite_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsInfinite_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeInfinite.shouldBeInfinite; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNaN_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNaN_Test.java index 957c4c0065..33405563ab 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNaN_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNaN_Test.java @@ -13,8 +13,8 @@ package org.assertj.core.internal.doubles; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Doubles; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNegative_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNegative_Test.java index e23c26bb4c..51f4995e05 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNegative_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNegative_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeLess.shouldBeLess; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotCloseToPercentage_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotCloseToPercentage_Test.java index 4ee2819c7d..c4536efab1 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotCloseToPercentage_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotCloseToPercentage_Test.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.withinPercentage; import static org.assertj.core.data.Percentage.withPercentage; import static org.assertj.core.error.ShouldNotBeEqualWithinPercentage.shouldNotBeEqualWithinPercentage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotFinite_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotFinite_Test.java index c16614e012..ac376b83bf 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotFinite_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotFinite_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeFinite.shouldNotBeFinite; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotInfinite_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotInfinite_Test.java index 5b83e4b1c9..bc70e18d3f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotInfinite_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotInfinite_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeInfinite.shouldNotBeInfinite; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotNaN_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotNaN_Test.java index 2992642348..7c20e25a72 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotNaN_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotNaN_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Doubles; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotNegative_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotNegative_Test.java index b2fe765801..7042644a8d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotNegative_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotNegative_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.internal.DoublesBaseTest; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotPositive_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotPositive_Test.java index f06b501339..b883e7fd44 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotPositive_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotPositive_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeLessOrEqual.shouldBeLessOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.internal.DoublesBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotZero_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotZero_Test.java index 6434b4cadd..5bbcdc18c1 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotZero_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsNotZero_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Doubles; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsOne_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsOne_Test.java index 259a588b0c..d7c9a47a7c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsOne_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsOne_Test.java @@ -13,8 +13,8 @@ package org.assertj.core.internal.doubles; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Doubles; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsPositive_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsPositive_Test.java index 996a49203c..8b956628f0 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsPositive_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsPositive_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Doubles; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsStrictlyBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsStrictlyBetween_Test.java index ac0a8b94cd..c19d64a93a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsStrictlyBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsStrictlyBetween_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeBetween.shouldBeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsZero_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsZero_Test.java index 89c11d3c3a..2f414c59c7 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsZero_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertIsZero_Test.java @@ -13,8 +13,8 @@ package org.assertj.core.internal.doubles; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.internal.DoublesBaseTest; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertLessThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertLessThanOrEqualTo_Test.java index 1169504bf9..9ae5adc503 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertLessThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertLessThanOrEqualTo_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeLessOrEqual.shouldBeLessOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertLessThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertLessThan_Test.java index 0715f375ba..8ddacb2672 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertLessThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertLessThan_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeLess.shouldBeLess; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertNotEqual_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertNotEqual_Test.java index 01109a0332..ebc5823c81 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertNotEqual_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/doubles/Doubles_assertNotEqual_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeEqual.shouldNotBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContainsAnyOf_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContainsAnyOf_Test.java index faf3284f9d..46e6b34af6 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContainsAnyOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContainsAnyOf_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal.floatarrays; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContainsExactlyInAnyOrder_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContainsExactlyInAnyOrder_Test.java index d18411fdc9..1e9ae342ed 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContainsExactlyInAnyOrder_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContainsExactlyInAnyOrder_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainExactlyInAnyOrder.shouldContainExactlyInAnyOrder; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.FloatArrays.arrayOf; -import static org.assertj.core.test.FloatArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContainsExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContainsExactly_Test.java index 2bc9fd159c..6b6a38b1f2 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContainsExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContainsExactly_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.error.ShouldContainExactly.elementsDifferAtIndex; import static org.assertj.core.error.ShouldContainExactly.shouldContainExactly; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.FloatArrays.arrayOf; -import static org.assertj.core.test.FloatArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.asList; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContainsOnlyOnce_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContainsOnlyOnce_Test.java index 4381a8331d..96d84533ec 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContainsOnlyOnce_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContainsOnlyOnce_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainsOnlyOnce.shouldContainsOnlyOnce; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.FloatArrays.arrayOf; -import static org.assertj.core.test.FloatArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContainsOnly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContainsOnly_Test.java index 2acbf6b8ea..2dfdd548bd 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContainsOnly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContainsOnly_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainOnly.shouldContainOnly; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.FloatArrays.arrayOf; -import static org.assertj.core.test.FloatArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContainsSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContainsSequence_Test.java index 3e528a332a..fe2c57837d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContainsSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContainsSequence_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainSequence.shouldContainSequence; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.FloatArrays.arrayOf; -import static org.assertj.core.test.FloatArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContains_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContains_Test.java index 92fcdc2138..905aa236fc 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContains_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContains_Test.java @@ -12,8 +12,8 @@ */ package org.assertj.core.internal.floatarrays; -import static org.assertj.core.test.FloatArrays.arrayOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.FloatArrays.arrayOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContains_at_Index_Test.java index 5e4a55580d..1a62843ba9 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertContains_at_Index_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldContainAtIndex.shouldContainAtIndex; -import static org.assertj.core.test.FloatArrays.emptyArray; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.FloatArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsEmpty; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertDoesNotContain_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertDoesNotContain_Test.java index 0419cca3b5..4467c5dc01 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertDoesNotContain_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertDoesNotContain_Test.java @@ -20,9 +20,9 @@ import static org.assertj.core.error.ShouldNotContain.shouldNotContain; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsEmpty; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.FloatArrays.arrayOf; -import static org.assertj.core.test.FloatArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertDoesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertDoesNotContain_at_Index_Test.java index e8071b8c2c..cecfb1eb67 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertDoesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertDoesNotContain_at_Index_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldNotContainAtIndex.shouldNotContainAtIndex; -import static org.assertj.core.test.FloatArrays.emptyArray; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.FloatArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertDoesNotHaveDuplicates_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertDoesNotHaveDuplicates_Test.java index 82f51ee2db..eb37fd4072 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertDoesNotHaveDuplicates_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertDoesNotHaveDuplicates_Test.java @@ -16,9 +16,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotHaveDuplicates.shouldNotHaveDuplicates; -import static org.assertj.core.test.FloatArrays.arrayOf; -import static org.assertj.core.test.FloatArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertEmpty_Test.java index 819a5ea88e..20fa2ea7fe 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertEmpty_Test.java @@ -16,8 +16,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEmpty.shouldBeEmpty; -import static org.assertj.core.test.FloatArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.FloatArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertEndsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertEndsWith_Test.java index 6f38a03b5e..79232ace63 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertEndsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertEndsWith_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldEndWith.shouldEndWith; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.FloatArrays.arrayOf; -import static org.assertj.core.test.FloatArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSameSizeAs_with_Array_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSameSizeAs_with_Array_Test.java index 07483f055b..0befc0ccb7 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSameSizeAs_with_Array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSameSizeAs_with_Array_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.floatarrays; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSameSizeAs_with_Iterable_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSameSizeAs_with_Iterable_Test.java index b912adeff7..65be342253 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSameSizeAs_with_Iterable_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSameSizeAs_with_Iterable_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.floatarrays; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.list; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSizeBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSizeBetween_Test.java index 329becf3fa..ccebe1bc52 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSizeBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSizeBetween_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.error.ShouldHaveSizeBetween.shouldHaveSizeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.FloatArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSizeGreaterThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSizeGreaterThanOrEqualTo_Test.java index c8f187403d..86fcfadace 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSizeGreaterThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSizeGreaterThanOrEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeGreaterThanOrEqualTo.shouldHaveSizeGreaterThanOrEqualTo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.FloatArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSizeGreaterThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSizeGreaterThan_Test.java index 3cb9ba263e..ba3f48c67d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSizeGreaterThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSizeGreaterThan_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeGreaterThan.shouldHaveSizeGreaterThan; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.FloatArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSizeLessThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSizeLessThanOrEqualTo_Test.java index 0e22f46755..cb6aae9acd 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSizeLessThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSizeLessThanOrEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeLessThanOrEqualTo.shouldHaveSizeLessThanOrEqualTo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.FloatArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSizeLessThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSizeLessThan_Test.java index 0f15e36a6c..d5a7dfd446 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSizeLessThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSizeLessThan_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeLessThan.shouldHaveSizeLessThan; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.FloatArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSize_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSize_Test.java index 09637c82be..5dc8555727 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSize_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertHasSize_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSize.shouldHaveSize; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertIsSortedAccordingToComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertIsSortedAccordingToComparator_Test.java index 2e810bb6fa..73b1309b24 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertIsSortedAccordingToComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertIsSortedAccordingToComparator_Test.java @@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeSorted.shouldBeSortedAccordingToGivenComparator; -import static org.assertj.core.test.FloatArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.FloatArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertIsSorted_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertIsSorted_Test.java index eec7678649..35d7777702 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertIsSorted_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertIsSorted_Test.java @@ -17,9 +17,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeSorted.shouldBeSorted; import static org.assertj.core.error.ShouldBeSorted.shouldBeSortedAccordingToGivenComparator; -import static org.assertj.core.test.FloatArrays.arrayOf; -import static org.assertj.core.test.FloatArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertNotEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertNotEmpty_Test.java index 6c0a73a43e..313ec56637 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertNotEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertNotEmpty_Test.java @@ -16,9 +16,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeEmpty.shouldNotBeEmpty; -import static org.assertj.core.test.FloatArrays.arrayOf; -import static org.assertj.core.test.FloatArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertNullOrEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertNullOrEmpty_Test.java index f8548bc687..d09d669dac 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertNullOrEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertNullOrEmpty_Test.java @@ -15,8 +15,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeNullOrEmpty.shouldBeNullOrEmpty; -import static org.assertj.core.test.FloatArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.FloatArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertStartsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertStartsWith_Test.java index f400626636..d99865b308 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertStartsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floatarrays/FloatArrays_assertStartsWith_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldStartWith.shouldStartWith; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.FloatArrays.arrayOf; -import static org.assertj.core.test.FloatArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.FloatArrays.arrayOf; +import static org.assertj.core.testkit.FloatArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertEqual_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertEqual_Test.java index a8c62ebaeb..cca382cd2b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertEqual_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertEqual_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEqual.shouldBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertGreaterThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertGreaterThanOrEqualTo_Test.java index c1ea5070d4..7626b991dd 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertGreaterThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertGreaterThanOrEqualTo_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeGreaterOrEqual.shouldBeGreaterOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertGreaterThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertGreaterThan_Test.java index 2cb334d53c..e1ea879f10 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertGreaterThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertGreaterThan_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeGreater.shouldBeGreater; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsBetween_Test.java index 99604df9bc..a7f0405460 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsBetween_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeBetween.shouldBeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsCloseToPercentage_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsCloseToPercentage_Test.java index 27a5bb4639..b4fbb9b88c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsCloseToPercentage_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsCloseToPercentage_Test.java @@ -23,7 +23,7 @@ import static org.assertj.core.api.Assertions.withinPercentage; import static org.assertj.core.data.Percentage.withPercentage; import static org.assertj.core.error.ShouldBeEqualWithinPercentage.shouldBeEqualWithinPercentage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsFinite_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsFinite_Test.java index 095084afcc..a2f77dd0c1 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsFinite_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsFinite_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeFinite.shouldBeFinite; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsInfinite_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsInfinite_Test.java index c8401c469e..89120789cc 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsInfinite_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsInfinite_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeInfinite.shouldBeInfinite; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNaN_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNaN_Test.java index 315c47b431..7665a7b8eb 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNaN_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNaN_Test.java @@ -13,8 +13,8 @@ package org.assertj.core.internal.floats; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Floats; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNegative_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNegative_Test.java index a5d59d6058..b701b52924 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNegative_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNegative_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeLess.shouldBeLess; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotCloseToPercentage_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotCloseToPercentage_Test.java index 64a72ec071..59a73e184f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotCloseToPercentage_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotCloseToPercentage_Test.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.withinPercentage; import static org.assertj.core.data.Percentage.withPercentage; import static org.assertj.core.error.ShouldNotBeEqualWithinPercentage.shouldNotBeEqualWithinPercentage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotCloseTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotCloseTo_Test.java index 0111ef8d98..039ca45d04 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotCloseTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotCloseTo_Test.java @@ -23,7 +23,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.Assertions.within; import static org.assertj.core.error.ShouldNotBeEqualWithinOffset.shouldNotBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotFinite_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotFinite_Test.java index 0717b48b08..1e4cf633b6 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotFinite_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotFinite_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeFinite.shouldNotBeFinite; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotInfinite_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotInfinite_Test.java index 7143c4a32a..bfe5becf1e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotInfinite_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotInfinite_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeInfinite.shouldNotBeInfinite; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotNaN_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotNaN_Test.java index b909f63c3e..2c7b2dc6b4 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotNaN_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotNaN_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Floats; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotNegative_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotNegative_Test.java index c1e338b636..0a074789cb 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotNegative_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotNegative_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.internal.FloatsBaseTest; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotPositive_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotPositive_Test.java index 8a6e2673ff..26ebeaff52 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotPositive_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotPositive_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeLessOrEqual.shouldBeLessOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.internal.FloatsBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotZero_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotZero_Test.java index f18fbf457c..16f9765024 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotZero_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsNotZero_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Floats; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsOne_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsOne_Test.java index 9491ef49be..22af088867 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsOne_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsOne_Test.java @@ -13,8 +13,8 @@ package org.assertj.core.internal.floats; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Floats; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsPositive_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsPositive_Test.java index e5cf087f28..8a5f4f06f6 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsPositive_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsPositive_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Floats; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsStrictlyBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsStrictlyBetween_Test.java index ae5e53cd19..092a773cd5 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsStrictlyBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsStrictlyBetween_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeBetween.shouldBeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsZero_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsZero_Test.java index 4cf476b052..b496892090 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsZero_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertIsZero_Test.java @@ -13,8 +13,8 @@ package org.assertj.core.internal.floats; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Floats; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertLessThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertLessThanOrEqualTo_Test.java index c1470a7742..a374a7f00b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertLessThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertLessThanOrEqualTo_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeLessOrEqual.shouldBeLessOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertLessThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertLessThan_Test.java index 6764133309..11c10b1504 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertLessThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertLessThan_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeLess.shouldBeLess; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertNotEqual_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertNotEqual_Test.java index 6e590ca243..c3d065ab30 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertNotEqual_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/floats/Floats_assertNotEqual_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeEqual.shouldNotBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/inputstreams/InputStreams_assertHasBinaryContent_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/inputstreams/InputStreams_assertHasBinaryContent_Test.java index be99fd4384..d7223fed93 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/inputstreams/InputStreams_assertHasBinaryContent_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/inputstreams/InputStreams_assertHasBinaryContent_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldHaveBinaryContent.shouldHaveBinaryContent; import static org.assertj.core.internal.BinaryDiffResult.noDiff; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.BDDMockito.given; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/inputstreams/InputStreams_assertHasContent_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/inputstreams/InputStreams_assertHasContent_Test.java index 5a323c608f..293bdacf6b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/inputstreams/InputStreams_assertHasContent_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/inputstreams/InputStreams_assertHasContent_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldHaveSameContent.shouldHaveSameContent; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.list; import static org.mockito.BDDMockito.given; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/inputstreams/InputStreams_assertSameContentAs_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/inputstreams/InputStreams_assertSameContentAs_Test.java index 385f256f09..71bcd33865 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/inputstreams/InputStreams_assertSameContentAs_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/inputstreams/InputStreams_assertSameContentAs_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldHaveSameContent.shouldHaveSameContent; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.mock; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContainsAnyOf_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContainsAnyOf_Test.java index ac77b2d2e7..33b5ec5740 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContainsAnyOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContainsAnyOf_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal.intarrays; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContainsExactlyInAnyOrder_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContainsExactlyInAnyOrder_Test.java index cdadf4b54b..623dcfcfd9 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContainsExactlyInAnyOrder_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContainsExactlyInAnyOrder_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainExactlyInAnyOrder.shouldContainExactlyInAnyOrder; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.IntArrays.arrayOf; -import static org.assertj.core.test.IntArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContainsExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContainsExactly_Test.java index 7219a9dd20..2a1b7b333a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContainsExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContainsExactly_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.error.ShouldContainExactly.elementsDifferAtIndex; import static org.assertj.core.error.ShouldContainExactly.shouldContainExactly; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.IntArrays.arrayOf; -import static org.assertj.core.test.IntArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.asList; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContainsOnlyOnce_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContainsOnlyOnce_Test.java index 9367cd10e1..7a5cb29ead 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContainsOnlyOnce_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContainsOnlyOnce_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainsOnlyOnce.shouldContainsOnlyOnce; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.IntArrays.arrayOf; -import static org.assertj.core.test.IntArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContainsOnly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContainsOnly_Test.java index 32b7cf8454..f69f253110 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContainsOnly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContainsOnly_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainOnly.shouldContainOnly; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.IntArrays.arrayOf; -import static org.assertj.core.test.IntArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContainsSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContainsSequence_Test.java index 679cc48166..a4f2d17105 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContainsSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContainsSequence_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainSequence.shouldContainSequence; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.IntArrays.arrayOf; -import static org.assertj.core.test.IntArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContains_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContains_Test.java index c8ff807776..0ea2ca48a7 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContains_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContains_Test.java @@ -12,8 +12,8 @@ */ package org.assertj.core.internal.intarrays; -import static org.assertj.core.test.IntArrays.arrayOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.IntArrays.arrayOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContains_at_Index_Test.java index a7f25530f1..73ef4db110 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertContains_at_Index_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldContainAtIndex.shouldContainAtIndex; -import static org.assertj.core.test.IntArrays.emptyArray; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.IntArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsEmpty; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertDoesNotContain_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertDoesNotContain_Test.java index 98591417b7..a6e904dd02 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertDoesNotContain_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertDoesNotContain_Test.java @@ -20,9 +20,9 @@ import static org.assertj.core.error.ShouldNotContain.shouldNotContain; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsEmpty; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.IntArrays.arrayOf; -import static org.assertj.core.test.IntArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertDoesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertDoesNotContain_at_Index_Test.java index 6c9f3a6179..20bf1da578 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertDoesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertDoesNotContain_at_Index_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldNotContainAtIndex.shouldNotContainAtIndex; -import static org.assertj.core.test.IntArrays.emptyArray; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.IntArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertDoesNotHaveDuplicates_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertDoesNotHaveDuplicates_Test.java index 4e8bfa1cea..8b0d57693f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertDoesNotHaveDuplicates_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertDoesNotHaveDuplicates_Test.java @@ -16,9 +16,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotHaveDuplicates.shouldNotHaveDuplicates; -import static org.assertj.core.test.IntArrays.arrayOf; -import static org.assertj.core.test.IntArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertEmpty_Test.java index 500df313ab..7feceabb61 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertEmpty_Test.java @@ -16,8 +16,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEmpty.shouldBeEmpty; -import static org.assertj.core.test.IntArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.IntArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertEndsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertEndsWith_Test.java index 5c84c20a88..fa6e1b6deb 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertEndsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertEndsWith_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldEndWith.shouldEndWith; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.IntArrays.arrayOf; -import static org.assertj.core.test.IntArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSameSizeAs_with_Array_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSameSizeAs_with_Array_Test.java index 4077afca12..ed9c21bb52 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSameSizeAs_with_Array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSameSizeAs_with_Array_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.intarrays; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSameSizeAs_with_Iterable_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSameSizeAs_with_Iterable_Test.java index 10fb9a4024..90b95ef86c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSameSizeAs_with_Iterable_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSameSizeAs_with_Iterable_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.intarrays; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSizeBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSizeBetween_Test.java index 58718176b9..1a2219357e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSizeBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSizeBetween_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.error.ShouldHaveSizeBetween.shouldHaveSizeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.IntArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSizeGreaterThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSizeGreaterThanOrEqualTo_Test.java index 539a5be463..09f9ad8080 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSizeGreaterThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSizeGreaterThanOrEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeGreaterThanOrEqualTo.shouldHaveSizeGreaterThanOrEqualTo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.IntArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSizeGreaterThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSizeGreaterThan_Test.java index b8579091f8..2b8465f5c0 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSizeGreaterThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSizeGreaterThan_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeGreaterThan.shouldHaveSizeGreaterThan; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.IntArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSizeLessThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSizeLessThanOrEqualTo_Test.java index 2a4af82154..b9bffdd374 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSizeLessThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSizeLessThanOrEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeLessThanOrEqualTo.shouldHaveSizeLessThanOrEqualTo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.IntArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSizeLessThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSizeLessThan_Test.java index 61638cc97c..2e8f4208ad 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSizeLessThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSizeLessThan_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeLessThan.shouldHaveSizeLessThan; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.IntArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSize_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSize_Test.java index 10f43aea0a..50979af1a0 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSize_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertHasSize_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSize.shouldHaveSize; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertIsSortedAccordingToComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertIsSortedAccordingToComparator_Test.java index 672000e014..e6ca663a0e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertIsSortedAccordingToComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertIsSortedAccordingToComparator_Test.java @@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeSorted.shouldBeSortedAccordingToGivenComparator; -import static org.assertj.core.test.IntArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.IntArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertIsSorted_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertIsSorted_Test.java index 6711b21816..85b39adfb6 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertIsSorted_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertIsSorted_Test.java @@ -17,9 +17,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeSorted.shouldBeSorted; import static org.assertj.core.error.ShouldBeSorted.shouldBeSortedAccordingToGivenComparator; -import static org.assertj.core.test.IntArrays.arrayOf; -import static org.assertj.core.test.IntArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertNotEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertNotEmpty_Test.java index d413b46255..ecdd43ea9a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertNotEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertNotEmpty_Test.java @@ -16,9 +16,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeEmpty.shouldNotBeEmpty; -import static org.assertj.core.test.IntArrays.arrayOf; -import static org.assertj.core.test.IntArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertNullOrEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertNullOrEmpty_Test.java index 93704ffa1c..8accfd2a73 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertNullOrEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertNullOrEmpty_Test.java @@ -15,8 +15,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeNullOrEmpty.shouldBeNullOrEmpty; -import static org.assertj.core.test.IntArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.IntArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertStartsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertStartsWith_Test.java index 69a3ca105f..431cb7275b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertStartsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/intarrays/IntArrays_assertStartsWith_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldStartWith.shouldStartWith; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.IntArrays.arrayOf; -import static org.assertj.core.test.IntArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.IntArrays.arrayOf; +import static org.assertj.core.testkit.IntArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertEqual_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertEqual_Test.java index ceb1dec12a..335efda262 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertEqual_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertEqual_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEqual.shouldBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertGreaterThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertGreaterThanOrEqualTo_Test.java index 531132c24a..06b3f89ad9 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertGreaterThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertGreaterThanOrEqualTo_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeGreaterOrEqual.shouldBeGreaterOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertGreaterThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertGreaterThan_Test.java index 47f6cd85e4..96d3ea508e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertGreaterThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertGreaterThan_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeGreater.shouldBeGreater; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsBetween_Test.java index eed190ace6..2a28161cdb 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsBetween_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeBetween.shouldBeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsCloseToPercentage_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsCloseToPercentage_Test.java index c06bedc574..2e663d3ba8 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsCloseToPercentage_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsCloseToPercentage_Test.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.withinPercentage; import static org.assertj.core.data.Percentage.withPercentage; import static org.assertj.core.error.ShouldBeEqualWithinPercentage.shouldBeEqualWithinPercentage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsCloseTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsCloseTo_Test.java index 06ab003f43..7046c58eeb 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsCloseTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsCloseTo_Test.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.Assertions.within; import static org.assertj.core.error.ShouldBeEqualWithinOffset.shouldBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsEven_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsEven_Test.java index b37c247a63..e5b99745ec 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsEven_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsEven_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeEven.shouldBeEven; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsNegative_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsNegative_Test.java index f83af0ed10..dccf3ee5aa 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsNegative_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsNegative_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeLess.shouldBeLess; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsNotCloseToPercentage_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsNotCloseToPercentage_Test.java index 07405082fb..dd00b664d0 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsNotCloseToPercentage_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsNotCloseToPercentage_Test.java @@ -21,7 +21,7 @@ import static org.assertj.core.api.Assertions.withinPercentage; import static org.assertj.core.data.Percentage.withPercentage; import static org.assertj.core.error.ShouldNotBeEqualWithinPercentage.shouldNotBeEqualWithinPercentage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsNotCloseTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsNotCloseTo_Test.java index 1583c04b84..0b2c5ae2d9 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsNotCloseTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsNotCloseTo_Test.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.Assertions.within; import static org.assertj.core.error.ShouldNotBeEqualWithinOffset.shouldNotBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsNotNegative_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsNotNegative_Test.java index 57de576c52..166b68acb5 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsNotNegative_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsNotNegative_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.internal.IntegersBaseTest; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsNotPositive_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsNotPositive_Test.java index b46cc8bd18..a8cf0b1510 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsNotPositive_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsNotPositive_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeLessOrEqual.shouldBeLessOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.internal.IntegersBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsNotZero_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsNotZero_Test.java index 0f71b63920..124e548faf 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsNotZero_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsNotZero_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Integers; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsOdd_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsOdd_Test.java index 10049b23ad..c91de7cffc 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsOdd_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsOdd_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeOdd.shouldBeOdd; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsOne_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsOne_Test.java index fa6659b52f..0c621e05b4 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsOne_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsOne_Test.java @@ -13,8 +13,8 @@ package org.assertj.core.internal.integers; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Integers; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsPositive_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsPositive_Test.java index 97fb548601..1937ec44f3 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsPositive_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsPositive_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Integers; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsStrictlyBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsStrictlyBetween_Test.java index cd59a1e104..d7e99eb848 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsStrictlyBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsStrictlyBetween_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeBetween.shouldBeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsZero_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsZero_Test.java index 01ec960bc5..bed60fb728 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsZero_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertIsZero_Test.java @@ -13,8 +13,8 @@ package org.assertj.core.internal.integers; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Integers; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertLessThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertLessThanOrEqualTo_Test.java index 577c66c66a..2dc658a1fc 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertLessThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertLessThanOrEqualTo_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeLessOrEqual.shouldBeLessOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertLessThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertLessThan_Test.java index 0136f6a0cc..d3611b296c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertLessThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertLessThan_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeLess.shouldBeLess; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertNotEqual_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertNotEqual_Test.java index 5daa1590ee..297d36978d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertNotEqual_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/integers/Integers_assertNotEqual_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeEqual.shouldNotBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAllMatch_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAllMatch_Test.java index 5dee8910f2..20dd1810c0 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAllMatch_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAllMatch_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ElementsShouldMatch.elementsShouldMatch; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAllSatisfy_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAllSatisfy_Test.java index 2d5d528632..df33144c5c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAllSatisfy_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAllSatisfy_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ElementsShouldSatisfy.elementsShouldSatisfy; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.list; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAnyMatch_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAnyMatch_Test.java index 3e43f1602c..bc0f3aea0a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAnyMatch_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAnyMatch_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.AnyElementShouldMatch.anyElementShouldMatch; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAnySatisfy_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAnySatisfy_Test.java index cffe74c16c..fc244143c1 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAnySatisfy_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAnySatisfy_Test.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ElementsShouldSatisfy.elementsShouldSatisfyAny; import static org.assertj.core.error.ElementsShouldSatisfy.unsatisfiedRequirement; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.list; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAreAtLeast_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAreAtLeast_Test.java index d63a5337a3..f63b496be7 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAreAtLeast_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAreAtLeast_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ElementsShouldBeAtLeast.elementsShouldBeAtLeast; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAreAtMost_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAreAtMost_Test.java index a7a325da35..3db3dc2c34 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAreAtMost_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAreAtMost_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ElementsShouldBeAtMost.elementsShouldBeAtMost; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAreExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAreExactly_Test.java index b43cea6a32..bf79ad7a33 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAreExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAreExactly_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ElementsShouldBeExactly.elementsShouldBeExactly; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAreNot_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAreNot_Test.java index 7a91996a24..99a13fbf21 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAreNot_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAreNot_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ElementsShouldNotBe.elementsShouldNotBe; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAre_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAre_Test.java index a2516ec215..cfe7cfd3d4 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAre_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertAre_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ElementsShouldBe.elementsShouldBe; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsAll_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsAll_Test.java index 819d70a9a8..fa2f67765f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsAll_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsAll_Test.java @@ -19,7 +19,7 @@ import static org.assertj.core.error.ShouldContain.shouldContain; import static org.assertj.core.internal.ErrorMessages.iterableToLookForIsNull; import static org.assertj.core.internal.iterables.SinglyIterableFactory.createSinglyIterable; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.assertj.core.util.Sets.newLinkedHashSet; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsAnyOf_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsAnyOf_Test.java index 87d4817ca6..560a03d265 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsAnyOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsAnyOf_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainAnyOf.shouldContainAnyOf; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.Name.name; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Name.name; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; @@ -31,7 +31,7 @@ import org.assertj.core.internal.Iterables; import org.assertj.core.internal.IterablesBaseTest; import org.assertj.core.internal.StandardComparisonStrategy; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Name; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsExactlyInAnyOrder_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsExactlyInAnyOrder_Test.java index 2313f02d45..39bef12503 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsExactlyInAnyOrder_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsExactlyInAnyOrder_Test.java @@ -19,8 +19,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainExactlyInAnyOrder.shouldContainExactlyInAnyOrder; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsExactly_Test.java index db9f141b0c..64de51cb51 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsExactly_Test.java @@ -22,7 +22,7 @@ import static org.assertj.core.error.ShouldContainExactly.shouldContainExactlyWithIndexes; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; import static org.assertj.core.internal.iterables.SinglyIterableFactory.createSinglyIterable; -import static org.assertj.core.test.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.Arrays.asList; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsNull_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsNull_Test.java index 63971728fe..13c27040bc 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsNull_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsNull_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainNull.shouldContainNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsOnlyNulls_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsOnlyNulls_Test.java index 2e05d47178..6c4135a5d4 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsOnlyNulls_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsOnlyNulls_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainOnlyNulls.shouldContainOnlyNulls; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsOnlyOnce_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsOnlyOnce_Test.java index 052176df81..41ef49926e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsOnlyOnce_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsOnlyOnce_Test.java @@ -19,8 +19,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainsOnlyOnce.shouldContainsOnlyOnce; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsOnly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsOnly_Test.java index d0b01df134..a528044f5c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsOnly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsOnly_Test.java @@ -19,8 +19,8 @@ import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; import static org.assertj.core.internal.iterables.SinglyIterableFactory.createSinglyIterable; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.Lists.list; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsSequence_Test.java index 3cca929651..8e246eb816 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsSequence_Test.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainSequence.shouldContainSequence; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.list; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsSubsequence_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsSubsequence_Test.java index d226baa89b..c85fa31fcd 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsSubsequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsSubsequence_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.error.ShouldContainSubsequence.actualDoesNotHaveEnoughElementsToContainSubsequence; import static org.assertj.core.error.ShouldContainSubsequence.shouldContainSubsequence; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContains_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContains_Test.java index 2cde64bebf..0db2aa9ad5 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContains_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContains_Test.java @@ -21,7 +21,7 @@ import static org.assertj.core.error.ShouldContain.shouldContain; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; import static org.assertj.core.internal.iterables.SinglyIterableFactory.createSinglyIterable; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoNotHave_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoNotHave_Test.java index 4dfebf9903..4debe80580 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoNotHave_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoNotHave_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ElementsShouldNotHave.elementsShouldNotHave; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoesNotContainAnyElementsOf_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoesNotContainAnyElementsOf_Test.java index 6618fe1d0b..daa91d698b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoesNotContainAnyElementsOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoesNotContainAnyElementsOf_Test.java @@ -21,7 +21,7 @@ import static org.assertj.core.error.ShouldNotContain.shouldNotContain; import static org.assertj.core.internal.ErrorMessages.iterableValuesToLookForIsEmpty; import static org.assertj.core.internal.ErrorMessages.iterableValuesToLookForIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.assertj.core.util.Sets.newLinkedHashSet; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoesNotContainNull_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoesNotContainNull_Test.java index e7d20da50d..c2d585e302 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoesNotContainNull_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoesNotContainNull_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotContainNull.shouldNotContainNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoesNotContainSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoesNotContainSequence_Test.java index e8b6089057..6e85916d0e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoesNotContainSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoesNotContainSequence_Test.java @@ -20,8 +20,8 @@ import static org.assertj.core.error.ShouldNotContainSequence.shouldNotContainSequence; import static org.assertj.core.internal.ErrorMessages.emptySequence; import static org.assertj.core.internal.ErrorMessages.nullSequence; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoesNotContainSubsequence_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoesNotContainSubsequence_Test.java index 3b5e442111..4e24ef23c4 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoesNotContainSubsequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoesNotContainSubsequence_Test.java @@ -20,8 +20,8 @@ import static org.assertj.core.error.ShouldNotContainSubsequence.shouldNotContainSubsequence; import static org.assertj.core.internal.ErrorMessages.emptySubsequence; import static org.assertj.core.internal.ErrorMessages.nullSubsequence; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoesNotContain_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoesNotContain_Test.java index 538f56537f..a5bfae796c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoesNotContain_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoesNotContain_Test.java @@ -21,8 +21,8 @@ import static org.assertj.core.error.ShouldNotContain.shouldNotContain; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsEmpty; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoesNotHaveDuplicates_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoesNotHaveDuplicates_Test.java index fca6e46224..ae36d5634a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoesNotHaveDuplicates_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertDoesNotHaveDuplicates_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotHaveDuplicates.shouldNotHaveDuplicates; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertEmpty_Test.java index 2719bda243..1b618e536e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertEmpty_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEmpty.shouldBeEmpty; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertEndsWithFirstAndRest_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertEndsWithFirstAndRest_Test.java index 6d17471ceb..6f568a3e93 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertEndsWithFirstAndRest_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertEndsWithFirstAndRest_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldEndWith.shouldEndWith; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.Arrays.prepend; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertEndsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertEndsWith_Test.java index 99a9c64678..74b2feb4a2 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertEndsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertEndsWith_Test.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldEndWith.shouldEndWith; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasOnlyOneElementSatisfying_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasOnlyOneElementSatisfying_Test.java index ab4a46fd68..a6809656cd 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasOnlyOneElementSatisfying_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasOnlyOneElementSatisfying_Test.java @@ -25,7 +25,7 @@ import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Iterables; import org.assertj.core.internal.IterablesBaseTest; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSameSizeAs_with_Array_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSameSizeAs_with_Array_Test.java index aa5112cf63..d36f8fb0b8 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSameSizeAs_with_Array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSameSizeAs_with_Array_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSameSizeAs_with_Iterable_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSameSizeAs_with_Iterable_Test.java index eb95dcf47e..8f554f4f2a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSameSizeAs_with_Iterable_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSameSizeAs_with_Iterable_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.list; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSizeBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSizeBetween_Test.java index 7882fb9852..d1bb763d20 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSizeBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSizeBetween_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.error.ShouldHaveSizeBetween.shouldHaveSizeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.IterablesBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSizeGreaterThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSizeGreaterThanOrEqualTo_Test.java index 3f47ce68a0..32b85b8b3f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSizeGreaterThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSizeGreaterThanOrEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeGreaterThanOrEqualTo.shouldHaveSizeGreaterThanOrEqualTo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.IterablesBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSizeGreaterThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSizeGreaterThan_Test.java index 7e861dd5e9..c00643aefe 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSizeGreaterThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSizeGreaterThan_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeGreaterThan.shouldHaveSizeGreaterThan; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.IterablesBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSizeLessThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSizeLessThanOrEqualTo_Test.java index bf7301a7d1..9660fdc47e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSizeLessThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSizeLessThanOrEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeLessThanOrEqualTo.shouldHaveSizeLessThanOrEqualTo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.IterablesBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSizeLessThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSizeLessThan_Test.java index 9ce4d7eba4..459ee08375 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSizeLessThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSizeLessThan_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeLessThan.shouldHaveSizeLessThan; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.IterablesBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSize_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSize_Test.java index 4547635dae..c1f30d2d21 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSize_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHasSize_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSize.shouldHaveSize; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHaveAtLeast_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHaveAtLeast_Test.java index f2a606fcbd..014aae0633 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHaveAtLeast_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHaveAtLeast_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ElementsShouldHaveAtLeast.elementsShouldHaveAtLeast; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHaveAtMost_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHaveAtMost_Test.java index a6b1d13ec4..403f41e030 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHaveAtMost_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHaveAtMost_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ElementsShouldHaveAtMost.elementsShouldHaveAtMost; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHaveExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHaveExactly_Test.java index d9a37d1fb7..6e9225e0e4 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHaveExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHaveExactly_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ElementsShouldHaveExactly.elementsShouldHaveExactly; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHave_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHave_Test.java index e02dffe788..97d68e5391 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHave_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertHave_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ElementsShouldHave.elementsShouldHave; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertIsSubsetOf_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertIsSubsetOf_Test.java index e15fb863a9..622ec4fed9 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertIsSubsetOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertIsSubsetOf_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeSubsetOf.shouldBeSubsetOf; import static org.assertj.core.internal.ErrorMessages.iterableToLookForIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertNoneMatch_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertNoneMatch_Test.java index 0b7adfef19..f4d9a8e232 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertNoneMatch_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertNoneMatch_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.NoElementsShouldMatch.noElementsShouldMatch; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertNoneSatisfy_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertNoneSatisfy_Test.java index a54e19897d..16dfffcf9c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertNoneSatisfy_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertNoneSatisfy_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.NoElementsShouldSatisfy.noElementsShouldSatisfy; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.list; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertNotEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertNotEmpty_Test.java index 4b63543897..f9592c1a0c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertNotEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertNotEmpty_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeEmpty.shouldNotBeEmpty; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertNullOrEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertNullOrEmpty_Test.java index 8c3fb3114a..49226e26ed 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertNullOrEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertNullOrEmpty_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeNullOrEmpty.shouldBeNullOrEmpty; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertSatisfiesExactlyInAnyOrder_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertSatisfiesExactlyInAnyOrder_Test.java index 5cd37b4f84..0bccca8dc3 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertSatisfiesExactlyInAnyOrder_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertSatisfiesExactlyInAnyOrder_Test.java @@ -26,7 +26,7 @@ import java.util.function.Consumer; import org.assertj.core.internal.IterablesBaseTest; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertSatisfiesOnlyOnce_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertSatisfiesOnlyOnce_Test.java index 9010e4c299..0770fcfac9 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertSatisfiesOnlyOnce_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertSatisfiesOnlyOnce_Test.java @@ -24,7 +24,7 @@ import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Iterables; import org.assertj.core.internal.IterablesBaseTest; -import org.assertj.core.test.jdk11.Jdk11.List; +import org.assertj.core.testkit.jdk11.Jdk11.List; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertStartsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertStartsWith_Test.java index 3d8d61ba46..50ea773895 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertStartsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertStartsWith_Test.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldStartWith.shouldStartWith; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertZipSatisfy_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertZipSatisfy_Test.java index 6fcf296a28..11028e7ce9 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertZipSatisfy_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/iterables/Iterables_assertZipSatisfy_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; import static org.assertj.core.error.ShouldStartWith.shouldStartWith; import static org.assertj.core.error.ZippedElementsShouldSatisfy.zippedElementsShouldSatisfy; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/lists/List_assertIs_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/lists/List_assertIs_Test.java index c9851921ac..c1376ba36c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/lists/List_assertIs_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/lists/List_assertIs_Test.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldBeAtIndex.shouldBeAtIndex; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsEmpty; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/lists/Lists_assertContains_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/lists/Lists_assertContains_Test.java index 29de22f5be..4c5fda66e7 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/lists/Lists_assertContains_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/lists/Lists_assertContains_Test.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldContainAtIndex.shouldContainAtIndex; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsEmpty; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/lists/Lists_assertDoesNotContain_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/lists/Lists_assertDoesNotContain_Test.java index 49a0b09db9..0575038a0d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/lists/Lists_assertDoesNotContain_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/lists/Lists_assertDoesNotContain_Test.java @@ -19,8 +19,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldNotContainAtIndex.shouldNotContainAtIndex; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/lists/Lists_assertHas_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/lists/Lists_assertHas_Test.java index 41cd26d9da..3e2bb58161 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/lists/Lists_assertHas_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/lists/Lists_assertHas_Test.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldHaveAtIndex.shouldHaveAtIndex; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsEmpty; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/lists/Lists_assertIsSortedAccordingToComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/lists/Lists_assertIsSortedAccordingToComparator_Test.java index 08500593c8..b90dbfa9b8 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/lists/Lists_assertIsSortedAccordingToComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/lists/Lists_assertIsSortedAccordingToComparator_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeSorted.shouldBeSortedAccordingToGivenComparator; import static org.assertj.core.error.ShouldBeSorted.shouldHaveComparableElementsAccordingToGivenComparator; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/lists/Lists_assertIsSorted_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/lists/Lists_assertIsSorted_Test.java index ec4e5cc9db..d394ff45b6 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/lists/Lists_assertIsSorted_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/lists/Lists_assertIsSorted_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.error.ShouldBeSorted.shouldBeSorted; import static org.assertj.core.error.ShouldBeSorted.shouldBeSortedAccordingToGivenComparator; import static org.assertj.core.error.ShouldBeSorted.shouldHaveMutuallyComparableElements; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/lists/Lists_satisfies_at_index_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/lists/Lists_satisfies_at_index_Test.java index 963cf18d57..e8b4934088 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/lists/Lists_satisfies_at_index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/lists/Lists_satisfies_at_index_Test.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Lists.newArrayList; import java.util.List; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContainsAnyOf_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContainsAnyOf_Test.java index b5cd275b9a..6712a5a1fc 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContainsAnyOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContainsAnyOf_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal.longarrays; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContainsExactlyInAnyOrder_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContainsExactlyInAnyOrder_Test.java index 0b30232d5c..1b824aa0b2 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContainsExactlyInAnyOrder_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContainsExactlyInAnyOrder_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainExactlyInAnyOrder.shouldContainExactlyInAnyOrder; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.LongArrays.arrayOf; -import static org.assertj.core.test.LongArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContainsExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContainsExactly_Test.java index 846ce96545..84a88c74ee 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContainsExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContainsExactly_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.error.ShouldContainExactly.elementsDifferAtIndex; import static org.assertj.core.error.ShouldContainExactly.shouldContainExactly; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.LongArrays.arrayOf; -import static org.assertj.core.test.LongArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.asList; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContainsOnlyOnce_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContainsOnlyOnce_Test.java index 0d2d556cbe..02f5f0ed93 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContainsOnlyOnce_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContainsOnlyOnce_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainsOnlyOnce.shouldContainsOnlyOnce; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.LongArrays.arrayOf; -import static org.assertj.core.test.LongArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContainsOnly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContainsOnly_Test.java index 1446cf9af3..240b959b5e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContainsOnly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContainsOnly_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainOnly.shouldContainOnly; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.LongArrays.arrayOf; -import static org.assertj.core.test.LongArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContainsSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContainsSequence_Test.java index babf018862..57e3d5dba7 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContainsSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContainsSequence_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainSequence.shouldContainSequence; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.LongArrays.arrayOf; -import static org.assertj.core.test.LongArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContains_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContains_Test.java index 32720d8658..ea4d236617 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContains_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContains_Test.java @@ -12,8 +12,8 @@ */ package org.assertj.core.internal.longarrays; -import static org.assertj.core.test.LongArrays.arrayOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.LongArrays.arrayOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContains_at_Index_Test.java index cb03a8b02b..9627bd1874 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertContains_at_Index_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldContainAtIndex.shouldContainAtIndex; -import static org.assertj.core.test.LongArrays.emptyArray; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.LongArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsEmpty; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertDoesNotContain_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertDoesNotContain_Test.java index 70e021858a..f9198f2975 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertDoesNotContain_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertDoesNotContain_Test.java @@ -20,9 +20,9 @@ import static org.assertj.core.error.ShouldNotContain.shouldNotContain; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsEmpty; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.LongArrays.arrayOf; -import static org.assertj.core.test.LongArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertDoesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertDoesNotContain_at_Index_Test.java index e79a8bb48f..728345d7eb 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertDoesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertDoesNotContain_at_Index_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldNotContainAtIndex.shouldNotContainAtIndex; -import static org.assertj.core.test.LongArrays.emptyArray; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.LongArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertDoesNotHaveDuplicates_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertDoesNotHaveDuplicates_Test.java index c25fe92a24..72093b4ae7 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertDoesNotHaveDuplicates_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertDoesNotHaveDuplicates_Test.java @@ -16,9 +16,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotHaveDuplicates.shouldNotHaveDuplicates; -import static org.assertj.core.test.LongArrays.arrayOf; -import static org.assertj.core.test.LongArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertEmpty_Test.java index 59459eb22d..3b433bf6f0 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertEmpty_Test.java @@ -16,8 +16,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEmpty.shouldBeEmpty; -import static org.assertj.core.test.LongArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.LongArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertEndsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertEndsWith_Test.java index 02cd5d22cb..b7be3a5ef2 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertEndsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertEndsWith_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldEndWith.shouldEndWith; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.LongArrays.arrayOf; -import static org.assertj.core.test.LongArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSameSizeAs_with_Array_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSameSizeAs_with_Array_Test.java index be9338d8e0..41221e6bb2 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSameSizeAs_with_Array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSameSizeAs_with_Array_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.longarrays; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSameSizeAs_with_Iterable_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSameSizeAs_with_Iterable_Test.java index 5f82255013..5743b148a4 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSameSizeAs_with_Iterable_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSameSizeAs_with_Iterable_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.longarrays; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.list; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSizeBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSizeBetween_Test.java index 991a477d27..7c04d22106 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSizeBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSizeBetween_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.error.ShouldHaveSizeBetween.shouldHaveSizeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.LongArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSizeGreaterThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSizeGreaterThanOrEqualTo_Test.java index d1e1f07664..55b53efad9 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSizeGreaterThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSizeGreaterThanOrEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeGreaterThanOrEqualTo.shouldHaveSizeGreaterThanOrEqualTo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.LongArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSizeGreaterThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSizeGreaterThan_Test.java index 8b7467cb42..368624981f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSizeGreaterThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSizeGreaterThan_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeGreaterThan.shouldHaveSizeGreaterThan; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.LongArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSizeLessThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSizeLessThanOrEqualTo_Test.java index e498a46edc..b36240912a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSizeLessThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSizeLessThanOrEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeLessThanOrEqualTo.shouldHaveSizeLessThanOrEqualTo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.LongArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSizeLessThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSizeLessThan_Test.java index da0f7e2d22..ad00714399 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSizeLessThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSizeLessThan_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeLessThan.shouldHaveSizeLessThan; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.LongArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSize_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSize_Test.java index 02288c0d1a..5c94afaf31 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSize_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertHasSize_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSize.shouldHaveSize; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertIsSortedAccordingToComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertIsSortedAccordingToComparator_Test.java index b9a9efbcf2..ce17d54c35 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertIsSortedAccordingToComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertIsSortedAccordingToComparator_Test.java @@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeSorted.shouldBeSortedAccordingToGivenComparator; -import static org.assertj.core.test.LongArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.LongArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertIsSorted_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertIsSorted_Test.java index a923c0597d..0598c15bee 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertIsSorted_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertIsSorted_Test.java @@ -17,9 +17,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeSorted.shouldBeSorted; import static org.assertj.core.error.ShouldBeSorted.shouldBeSortedAccordingToGivenComparator; -import static org.assertj.core.test.LongArrays.arrayOf; -import static org.assertj.core.test.LongArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertNotEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertNotEmpty_Test.java index a3881975f7..64f761bf78 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertNotEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertNotEmpty_Test.java @@ -16,9 +16,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeEmpty.shouldNotBeEmpty; -import static org.assertj.core.test.LongArrays.arrayOf; -import static org.assertj.core.test.LongArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertNullOrEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertNullOrEmpty_Test.java index 3e5e4aa3fd..23f1989d57 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertNullOrEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertNullOrEmpty_Test.java @@ -15,8 +15,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeNullOrEmpty.shouldBeNullOrEmpty; -import static org.assertj.core.test.LongArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.LongArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertStartsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertStartsWith_Test.java index a17dbf4667..ffb677ea2c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertStartsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longarrays/LongArrays_assertStartsWith_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldStartWith.shouldStartWith; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.LongArrays.arrayOf; -import static org.assertj.core.test.LongArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.LongArrays.arrayOf; +import static org.assertj.core.testkit.LongArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertEqual_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertEqual_Test.java index 22ff664058..4339b55736 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertEqual_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertEqual_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEqual.shouldBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertGreaterThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertGreaterThanOrEqualTo_Test.java index 44d700739c..1295d5b868 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertGreaterThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertGreaterThanOrEqualTo_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeGreaterOrEqual.shouldBeGreaterOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertGreaterThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertGreaterThan_Test.java index 676fc501e3..5f5f759484 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertGreaterThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertGreaterThan_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeGreater.shouldBeGreater; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsCloseToPercentage_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsCloseToPercentage_Test.java index 20b16b671d..b08d0b88ee 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsCloseToPercentage_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsCloseToPercentage_Test.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.withinPercentage; import static org.assertj.core.data.Percentage.withPercentage; import static org.assertj.core.error.ShouldBeEqualWithinPercentage.shouldBeEqualWithinPercentage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsCloseTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsCloseTo_Test.java index b420db1d08..adc587728b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsCloseTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsCloseTo_Test.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.Assertions.within; import static org.assertj.core.error.ShouldBeEqualWithinOffset.shouldBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsEven_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsEven_Test.java index 49b8c0ab24..ecf0c7fa85 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsEven_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsEven_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeEven.shouldBeEven; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsNotCloseToPercentage_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsNotCloseToPercentage_Test.java index 51b9349d58..87c95ee159 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsNotCloseToPercentage_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsNotCloseToPercentage_Test.java @@ -21,7 +21,7 @@ import static org.assertj.core.api.Assertions.withinPercentage; import static org.assertj.core.data.Percentage.withPercentage; import static org.assertj.core.error.ShouldNotBeEqualWithinPercentage.shouldNotBeEqualWithinPercentage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsNotCloseTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsNotCloseTo_Test.java index 7012f50fd1..b42f311bd2 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsNotCloseTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsNotCloseTo_Test.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.Assertions.within; import static org.assertj.core.error.ShouldNotBeEqualWithinOffset.shouldNotBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsNotNegative_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsNotNegative_Test.java index e7ca5d06aa..84e4e044c8 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsNotNegative_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsNotNegative_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.internal.LongsBaseTest; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsNotPositive_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsNotPositive_Test.java index c798ca8665..6c84b92531 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsNotPositive_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsNotPositive_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeLessOrEqual.shouldBeLessOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.internal.LongsBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsNotZero_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsNotZero_Test.java index a670cb2d9f..1e4fbe93cf 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsNotZero_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsNotZero_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Longs; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsOdd_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsOdd_Test.java index 78eed2aa7c..7fe3fd92fd 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsOdd_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsOdd_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeOdd.shouldBeOdd; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsOne_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsOne_Test.java index d45a01971b..638d5b7c7d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsOne_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsOne_Test.java @@ -13,8 +13,8 @@ package org.assertj.core.internal.longs; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Longs; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsPositive_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsPositive_Test.java index 06c96190a3..d783741d46 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsPositive_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsPositive_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Longs; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsZero_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsZero_Test.java index 30689e386c..fc7064946f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsZero_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertIsZero_Test.java @@ -13,8 +13,8 @@ package org.assertj.core.internal.longs; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Longs; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertLessThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertLessThanOrEqualTo_Test.java index c812bacf4a..8ceefa449f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertLessThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertLessThanOrEqualTo_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeLessOrEqual.shouldBeLessOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertLessThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertLessThan_Test.java index b143c87504..b09cb667d5 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertLessThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertLessThan_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeLess.shouldBeLess; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertNotEqual_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertNotEqual_Test.java index bcdc60ba10..af17853c4d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertNotEqual_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/longs/Longs_assertNotEqual_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeEqual.shouldNotBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertAllSatisfyingConsumer_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertAllSatisfyingConsumer_Test.java index 4e7ef3f89f..6062b6ef25 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertAllSatisfyingConsumer_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertAllSatisfyingConsumer_Test.java @@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ElementsShouldSatisfy.elementsShouldSatisfy; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.list; @@ -30,7 +30,7 @@ import org.assertj.core.error.UnsatisfiedRequirement; import org.assertj.core.internal.MapsBaseTest; -import org.assertj.core.test.Player; +import org.assertj.core.testkit.Player; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertAnySatisfyingConsumer_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertAnySatisfyingConsumer_Test.java index fc0842bccc..ea911c4b59 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertAnySatisfyingConsumer_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertAnySatisfyingConsumer_Test.java @@ -19,8 +19,8 @@ import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ElementsShouldSatisfy.elementsShouldSatisfyAny; import static org.assertj.core.error.ElementsShouldSatisfy.unsatisfiedRequirement; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.list; @@ -38,7 +38,7 @@ import org.assertj.core.error.UnsatisfiedRequirement; import org.assertj.core.internal.MapsBaseTest; -import org.assertj.core.test.Player; +import org.assertj.core.testkit.Player; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsAllEntriesOf_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsAllEntriesOf_Test.java index 9ef6088e14..893ad381de 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsAllEntriesOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsAllEntriesOf_Test.java @@ -19,7 +19,7 @@ import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldContainEntries.shouldContainEntries; import static org.assertj.core.internal.ErrorMessages.mapOfEntriesToLookForIsNull; -import static org.assertj.core.test.Maps.mapOf; +import static org.assertj.core.testkit.Maps.mapOf; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.set; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsAnyOf_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsAnyOf_Test.java index b6c774972f..92f330e38d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsAnyOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsAnyOf_Test.java @@ -19,7 +19,7 @@ import static org.assertj.core.error.ShouldContainAnyOf.shouldContainAnyOf; import static org.assertj.core.internal.ErrorMessages.entriesToLookForIsNull; import static org.assertj.core.internal.ErrorMessages.entryToLookForIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsExactly_Test.java index f53f55765a..9a9416737a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsExactly_Test.java @@ -22,8 +22,8 @@ import static org.assertj.core.error.ShouldContainExactly.shouldContainExactly; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; import static org.assertj.core.internal.ErrorMessages.entriesToLookForIsNull; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.Arrays.asList; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsKey_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsKey_Test.java index bf7fe4be09..27ecdcf7c3 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsKey_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsKey_Test.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldContainKeys.shouldContainKeys; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.set; @@ -34,7 +34,7 @@ import org.apache.commons.collections4.map.SingletonMap; import org.apache.commons.lang3.ArrayUtils; import org.assertj.core.internal.MapsBaseTest; -import org.assertj.core.test.jdk11.Jdk11; +import org.assertj.core.testkit.jdk11.Jdk11; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsKeys_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsKeys_Test.java index 3513366245..3c8843ab71 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsKeys_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsKeys_Test.java @@ -23,8 +23,8 @@ import static org.assertj.core.error.ShouldContainKeys.shouldContainKeys; import static org.assertj.core.internal.ErrorMessages.keysToLookForIsEmpty; import static org.assertj.core.internal.ErrorMessages.keysToLookForIsNull; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; @@ -40,7 +40,7 @@ import org.apache.commons.collections4.map.SingletonMap; import org.apache.commons.lang3.ArrayUtils; import org.assertj.core.internal.MapsBaseTest; -import org.assertj.core.test.jdk11.Jdk11; +import org.assertj.core.testkit.jdk11.Jdk11; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsOnlyKeys_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsOnlyKeys_Test.java index 8cb5d75a5d..d85dd89550 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsOnlyKeys_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsOnlyKeys_Test.java @@ -24,8 +24,8 @@ import static org.assertj.core.error.ShouldContainOnlyKeys.shouldContainOnlyKeys; import static org.assertj.core.internal.ErrorMessages.keysToLookForIsEmpty; import static org.assertj.core.internal.ErrorMessages.keysToLookForIsNull; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; @@ -41,7 +41,7 @@ import org.apache.commons.collections4.map.SingletonMap; import org.apache.commons.lang3.ArrayUtils; import org.assertj.core.internal.MapsBaseTest; -import org.assertj.core.test.jdk11.Jdk11; +import org.assertj.core.testkit.jdk11.Jdk11; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsOnly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsOnly_Test.java index 7b55d16cc4..15cc92f7f6 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsOnly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsOnly_Test.java @@ -24,8 +24,8 @@ import static org.assertj.core.error.ShouldBeEmpty.shouldBeEmpty; import static org.assertj.core.error.ShouldContainOnly.shouldContainOnly; import static org.assertj.core.internal.ErrorMessages.entriesToLookForIsNull; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsValue_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsValue_Test.java index d9f6d5daa3..58e7419ae7 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsValue_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsValue_Test.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldContainValue.shouldContainValue; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.junit.jupiter.params.provider.Arguments.arguments; @@ -31,7 +31,7 @@ import org.apache.commons.collections4.map.SingletonMap; import org.assertj.core.internal.MapsBaseTest; -import org.assertj.core.test.jdk11.Jdk11; +import org.assertj.core.testkit.jdk11.Jdk11; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsValues_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsValues_Test.java index 25a3126c4c..07ca8608bb 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsValues_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertContainsValues_Test.java @@ -21,8 +21,8 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldContainValues.shouldContainValues; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; @@ -35,7 +35,7 @@ import org.apache.commons.collections4.map.SingletonMap; import org.assertj.core.internal.MapsBaseTest; -import org.assertj.core.test.jdk11.Jdk11; +import org.assertj.core.testkit.jdk11.Jdk11; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertDoesNotContainKey_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertDoesNotContainKey_Test.java index e422f1f8a2..182786bd56 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertDoesNotContainKey_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertDoesNotContainKey_Test.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldNotContainKey.shouldNotContainKey; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.junit.jupiter.params.provider.Arguments.arguments; @@ -33,7 +33,7 @@ import org.apache.commons.collections4.map.SingletonMap; import org.apache.commons.lang3.ArrayUtils; import org.assertj.core.internal.MapsBaseTest; -import org.assertj.core.test.jdk11.Jdk11; +import org.assertj.core.testkit.jdk11.Jdk11; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertDoesNotContainKeys_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertDoesNotContainKeys_Test.java index 78ae89a450..3a8d5d2aad 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertDoesNotContainKeys_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertDoesNotContainKeys_Test.java @@ -22,8 +22,8 @@ import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldNotContainKeys.shouldNotContainKeys; import static org.assertj.core.internal.ErrorMessages.keysToLookForIsNull; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; @@ -38,7 +38,7 @@ import org.apache.commons.collections4.map.SingletonMap; import org.apache.commons.lang3.ArrayUtils; import org.assertj.core.internal.MapsBaseTest; -import org.assertj.core.test.jdk11.Jdk11; +import org.assertj.core.testkit.jdk11.Jdk11; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertDoesNotContainValue_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertDoesNotContainValue_Test.java index 282d5079a7..f60039d000 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertDoesNotContainValue_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertDoesNotContainValue_Test.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldNotContainValue.shouldNotContainValue; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.junit.jupiter.params.provider.Arguments.arguments; @@ -31,7 +31,7 @@ import org.apache.commons.collections4.map.SingletonMap; import org.assertj.core.internal.MapsBaseTest; -import org.assertj.core.test.jdk11.Jdk11; +import org.assertj.core.testkit.jdk11.Jdk11; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertDoesNotContain_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertDoesNotContain_Test.java index 33058d3042..67b49e8507 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertDoesNotContain_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertDoesNotContain_Test.java @@ -21,7 +21,7 @@ import static org.assertj.core.error.ShouldNotContain.shouldNotContain; import static org.assertj.core.internal.ErrorMessages.entriesToLookForIsEmpty; import static org.assertj.core.internal.ErrorMessages.entriesToLookForIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertEmpty_Test.java index c99114534a..d9160b99c2 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertEmpty_Test.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldBeEmpty.shouldBeEmpty; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasEntrySatisfyingCondition_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasEntrySatisfyingCondition_Test.java index 868c61bf42..e76e1f39a0 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasEntrySatisfyingCondition_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasEntrySatisfyingCondition_Test.java @@ -19,8 +19,8 @@ import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ElementsShouldBe.elementsShouldBe; import static org.assertj.core.error.ShouldContainKeys.shouldContainKeys; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasEntrySatisfyingConsumer_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasEntrySatisfyingConsumer_Test.java index bec2dfe73c..e95f11d97e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasEntrySatisfyingConsumer_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasEntrySatisfyingConsumer_Test.java @@ -18,8 +18,8 @@ import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldContainKeys.shouldContainKeys; import static org.assertj.core.error.ShouldContainPattern.shouldContainPattern; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasEntrySatisfying_with_entry_condition_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasEntrySatisfying_with_entry_condition_Test.java index 30c33f45cc..20fd5ebfc8 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasEntrySatisfying_with_entry_condition_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasEntrySatisfying_with_entry_condition_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainEntry.shouldContainEntry; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasEntrySatisfying_with_key_and_condition_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasEntrySatisfying_with_key_and_condition_Test.java index 88310dcfb8..ca5b779613 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasEntrySatisfying_with_key_and_condition_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasEntrySatisfying_with_key_and_condition_Test.java @@ -19,8 +19,8 @@ import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ElementsShouldBe.elementsShouldBe; import static org.assertj.core.error.ShouldContainKeys.shouldContainKeys; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasEntrySatisfying_with_key_and_value_conditions_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasEntrySatisfying_with_key_and_value_conditions_Test.java index 9ce21f3426..7d2da7d27d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasEntrySatisfying_with_key_and_value_conditions_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasEntrySatisfying_with_key_and_value_conditions_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainEntry.shouldContainEntry; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasKeySatisfying_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasKeySatisfying_Test.java index 079c0de26f..5d946d80c7 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasKeySatisfying_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasKeySatisfying_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainKey.shouldContainKey; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSameSizeAs_with_Array_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSameSizeAs_with_Array_Test.java index a0a686a910..58aecbf624 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSameSizeAs_with_Array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSameSizeAs_with_Array_Test.java @@ -14,8 +14,8 @@ import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSameSizeAs_with_Iterable_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSameSizeAs_with_Iterable_Test.java index 39636c17eb..b2c9dcaf53 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSameSizeAs_with_Iterable_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSameSizeAs_with_Iterable_Test.java @@ -14,8 +14,8 @@ import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.list; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSameSizeAs_with_Map_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSameSizeAs_with_Map_Test.java index 571d4bddc8..039aee9d38 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSameSizeAs_with_Map_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSameSizeAs_with_Map_Test.java @@ -15,8 +15,8 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSizeBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSizeBetween_Test.java index b894a68f07..2504f37a60 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSizeBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSizeBetween_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.error.ShouldHaveSizeBetween.shouldHaveSizeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.MapsBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSizeGreaterThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSizeGreaterThanOrEqualTo_Test.java index 89df687b31..8370d9402d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSizeGreaterThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSizeGreaterThanOrEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeGreaterThanOrEqualTo.shouldHaveSizeGreaterThanOrEqualTo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.MapsBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSizeGreaterThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSizeGreaterThan_Test.java index 48f97113d5..3a9e3c161f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSizeGreaterThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSizeGreaterThan_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeGreaterThan.shouldHaveSizeGreaterThan; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.MapsBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSizeLessThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSizeLessThanOrEqualTo_Test.java index d9ad36f2ad..d32b692f2d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSizeLessThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSizeLessThanOrEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeLessThanOrEqualTo.shouldHaveSizeLessThanOrEqualTo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.MapsBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSizeLessThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSizeLessThan_Test.java index f5301152e2..9bc3e8195c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSizeLessThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSizeLessThan_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeLessThan.shouldHaveSizeLessThan; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.MapsBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSize_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSize_Test.java index 6e0dc5e843..e8ce2c8841 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSize_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasSize_Test.java @@ -15,8 +15,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldHaveSize.shouldHaveSize; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import java.util.Map; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasValueSatisfying_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasValueSatisfying_Test.java index bdda5ecbec..f1754a0335 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasValueSatisfying_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertHasValueSatisfying_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainValue.shouldContainValue; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertNoneSatisfy_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertNoneSatisfy_Test.java index e60aa139b1..6e84817b3d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertNoneSatisfy_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertNoneSatisfy_Test.java @@ -16,8 +16,8 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.NoElementsShouldSatisfy.noElementsShouldSatisfy; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.list; @@ -27,7 +27,7 @@ import java.util.Map; import org.assertj.core.internal.MapsBaseTest; -import org.assertj.core.test.Player; +import org.assertj.core.testkit.Player; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertNotEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertNotEmpty_Test.java index ce832595e3..7f92702b6c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertNotEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertNotEmpty_Test.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldNotBeEmpty.shouldNotBeEmpty; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertNullOrEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertNullOrEmpty_Test.java index 1ea7bef286..32bea10312 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertNullOrEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/maps/Maps_assertNullOrEmpty_Test.java @@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.MapEntry.entry; import static org.assertj.core.error.ShouldBeNullOrEmpty.shouldBeNullOrEmpty; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import java.util.Map; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertAreAtLeast_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertAreAtLeast_Test.java index 201a34d08a..b33328896d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertAreAtLeast_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertAreAtLeast_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ElementsShouldBeAtLeast.elementsShouldBeAtLeast; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertAreAtMost_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertAreAtMost_Test.java index 10d444cafe..766795bcc2 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertAreAtMost_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertAreAtMost_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ElementsShouldBeAtMost.elementsShouldBeAtMost; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertAreExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertAreExactly_Test.java index a30d70f998..65eefd643d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertAreExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertAreExactly_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ElementsShouldBeExactly.elementsShouldBeExactly; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertAreNot_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertAreNot_Test.java index 5492d8297e..a299fe737f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertAreNot_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertAreNot_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ElementsShouldNotBe.elementsShouldNotBe; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertAre_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertAre_Test.java index d541c64845..82f12a3716 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertAre_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertAre_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ElementsShouldBe.elementsShouldBe; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsAll_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsAll_Test.java index 453fb2f17e..43c356e115 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsAll_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsAll_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContain.shouldContain; import static org.assertj.core.internal.ErrorMessages.iterableToLookForIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsAnyOf_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsAnyOf_Test.java index 3db8a02ebc..b42676505b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsAnyOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsAnyOf_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal.objectarrays; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsExactlyInAnyOrder_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsExactlyInAnyOrder_Test.java index ea9a875875..633d7675b5 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsExactlyInAnyOrder_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsExactlyInAnyOrder_Test.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainExactlyInAnyOrder.shouldContainExactlyInAnyOrder; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsExactly_Test.java index 039cdd351a..e8de671d44 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsExactly_Test.java @@ -19,7 +19,7 @@ import static org.assertj.core.error.ShouldContainExactly.elementsDifferAtIndex; import static org.assertj.core.error.ShouldContainExactly.shouldContainExactly; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.Arrays.asList; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsNull_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsNull_Test.java index 66c781acaa..f67a05a662 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsNull_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsNull_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainNull.shouldContainNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsOnlyNulls_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsOnlyNulls_Test.java index 42e44dca47..dd132ae650 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsOnlyNulls_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsOnlyNulls_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainOnlyNulls.shouldContainOnlyNulls; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsOnlyOnce_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsOnlyOnce_Test.java index 77f2947980..a0a15c04b9 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsOnlyOnce_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsOnlyOnce_Test.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainsOnlyOnce.shouldContainsOnlyOnce; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsOnly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsOnly_Test.java index e22e2fa1a6..587af42837 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsOnly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsOnly_Test.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainOnly.shouldContainOnly; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsSequence_Test.java index d3ca9ea35f..378f3876ef 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsSequence_Test.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainSequence.shouldContainSequence; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsSubsequence_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsSubsequence_Test.java index ae3f4a43a8..efa27da6db 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsSubsequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContainsSubsequence_Test.java @@ -18,8 +18,8 @@ import static org.assertj.core.error.ShouldContainSubsequence.actualDoesNotHaveEnoughElementsToContainSubsequence; import static org.assertj.core.error.ShouldContainSubsequence.shouldContainSubsequence; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContains_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContains_Test.java index d5d865c348..2ae0314d6e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContains_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContains_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal.objectarrays; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContains_at_Index_Test.java index 3dcd86a979..731355bc91 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertContains_at_Index_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldContainAtIndex.shouldContainAtIndex; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsEmpty; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoNotHave_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoNotHave_Test.java index 0362dc4e69..91faa74702 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoNotHave_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoNotHave_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ElementsShouldNotHave.elementsShouldNotHave; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotContainAnyElementsOf_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotContainAnyElementsOf_Test.java index 8e7d1d1c4e..d0f49eacf3 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotContainAnyElementsOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotContainAnyElementsOf_Test.java @@ -20,7 +20,7 @@ import static org.assertj.core.error.ShouldNotContain.shouldNotContain; import static org.assertj.core.internal.ErrorMessages.iterableValuesToLookForIsEmpty; import static org.assertj.core.internal.ErrorMessages.iterableValuesToLookForIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.assertj.core.util.Sets.newLinkedHashSet; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotContainNull_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotContainNull_Test.java index f818f04c29..26e087b6aa 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotContainNull_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotContainNull_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotContainNull.shouldNotContainNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotContainSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotContainSequence_Test.java index d375f06ade..c6f902096e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotContainSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotContainSequence_Test.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotContainSequence.shouldNotContainSequence; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotContainSubsequence_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotContainSubsequence_Test.java index bd9772202e..50af47aa5c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotContainSubsequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotContainSubsequence_Test.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotContainSubsequence.shouldNotContainSubsequence; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotContain_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotContain_Test.java index 43ee5f271f..3c93f10c77 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotContain_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotContain_Test.java @@ -20,8 +20,8 @@ import static org.assertj.core.error.ShouldNotContain.shouldNotContain; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsEmpty; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotContain_at_Index_Test.java index 1523f14d29..da8b2aae7e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotContain_at_Index_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldNotContainAtIndex.shouldNotContainAtIndex; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotHaveAnyElementsOfTypes_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotHaveAnyElementsOfTypes_Test.java index c1a4cfa265..6486abe8dd 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotHaveAnyElementsOfTypes_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotHaveAnyElementsOfTypes_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldNotHaveAnyElementsOfTypes.shouldNotHaveAnyElementsOfTypes; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotHaveDuplicates_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotHaveDuplicates_Test.java index 188386447f..ef985d5b0a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotHaveDuplicates_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertDoesNotHaveDuplicates_Test.java @@ -16,8 +16,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotHaveDuplicates.shouldNotHaveDuplicates; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertEmpty_Test.java index 6dadb99dfa..6dae4b8a85 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertEmpty_Test.java @@ -16,8 +16,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEmpty.shouldBeEmpty; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertEndsWithFirstAndRest_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertEndsWithFirstAndRest_Test.java index 6367a4c35b..87b4252ca3 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertEndsWithFirstAndRest_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertEndsWithFirstAndRest_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldEndWith.shouldEndWith; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.Arrays.prepend; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertEndsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertEndsWith_Test.java index ce3cf7979b..0ef80ca6f3 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertEndsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertEndsWith_Test.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldEndWith.shouldEndWith; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasAtLeastOneElementOfType_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasAtLeastOneElementOfType_Test.java index 5ea5c3c6bc..d612673402 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasAtLeastOneElementOfType_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasAtLeastOneElementOfType_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldHaveAtLeastOneElementOfType.shouldHaveAtLeastOneElementOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.ObjectArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasExactlyElementsOfTypes_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasExactlyElementsOfTypes_Test.java index 07f2c19e7f..0f8acde013 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasExactlyElementsOfTypes_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasExactlyElementsOfTypes_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldHaveExactlyTypes.elementsTypesDifferAtIndex; import static org.assertj.core.error.ShouldHaveExactlyTypes.shouldHaveTypes; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.list; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasOnlyElementsOfType_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasOnlyElementsOfType_Test.java index 0508b61539..fdd38e8265 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasOnlyElementsOfType_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasOnlyElementsOfType_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldHaveOnlyElementsOfType.shouldHaveOnlyElementsOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasOnlyElementsOfTypes_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasOnlyElementsOfTypes_Test.java index 389bbb5ea9..1a3b50f587 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasOnlyElementsOfTypes_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasOnlyElementsOfTypes_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.error.ShouldOnlyHaveElementsOfTypes.shouldOnlyHaveElementsOfTypes; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSameSizeAs_with_Array_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSameSizeAs_with_Array_Test.java index f65ba3df83..96366e0a3b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSameSizeAs_with_Array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSameSizeAs_with_Array_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSameSizeAs_with_Iterable_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSameSizeAs_with_Iterable_Test.java index c1d1b9744f..03f68c95a4 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSameSizeAs_with_Iterable_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSameSizeAs_with_Iterable_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSizeBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSizeBetween_Test.java index 061ab03e7e..633cb4b7d1 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSizeBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSizeBetween_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.error.ShouldHaveSizeBetween.shouldHaveSizeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.ObjectArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSizeGreaterThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSizeGreaterThanOrEqualTo_Test.java index 43641dc648..2f244fab11 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSizeGreaterThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSizeGreaterThanOrEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeGreaterThanOrEqualTo.shouldHaveSizeGreaterThanOrEqualTo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.ObjectArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSizeGreaterThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSizeGreaterThan_Test.java index 4b1b97a728..4f202e76f0 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSizeGreaterThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSizeGreaterThan_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeGreaterThan.shouldHaveSizeGreaterThan; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.ObjectArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSizeLessThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSizeLessThanOrEqualTo_Test.java index 4297329c66..550c51f47a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSizeLessThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSizeLessThanOrEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeLessThanOrEqualTo.shouldHaveSizeLessThanOrEqualTo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.ObjectArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSizeLessThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSizeLessThan_Test.java index 6f0143c4c7..3f0d6460e5 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSizeLessThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSizeLessThan_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeLessThan.shouldHaveSizeLessThan; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.ObjectArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSize_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSize_Test.java index c09a1b6ff9..5f8de4dc96 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSize_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHasSize_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSize.shouldHaveSize; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHaveAtLeast_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHaveAtLeast_Test.java index bf08b10fc9..7a18b3f22c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHaveAtLeast_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHaveAtLeast_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ElementsShouldHaveAtLeast.elementsShouldHaveAtLeast; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHaveAtMost_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHaveAtMost_Test.java index c13f37eea7..851611c3ca 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHaveAtMost_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHaveAtMost_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ElementsShouldHaveAtMost.elementsShouldHaveAtMost; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHaveExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHaveExactly_Test.java index 8e0aaf6c97..28883d21db 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHaveExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHaveExactly_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ElementsShouldHaveExactly.elementsShouldHaveExactly; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHaveNot_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHaveNot_Test.java index 5148a6c757..0fbec9df14 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHaveNot_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHaveNot_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ElementsShouldNotHave.elementsShouldNotHave; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHave_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHave_Test.java index 47b618e49f..d4e02461f7 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHave_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertHave_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ElementsShouldHave.elementsShouldHave; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertIsSortedAccordingToComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertIsSortedAccordingToComparator_Test.java index ddb23fd582..862fab21ce 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertIsSortedAccordingToComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertIsSortedAccordingToComparator_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeSorted.shouldBeSortedAccordingToGivenComparator; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertIsSorted_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertIsSorted_Test.java index d850c4cf2a..1c201e4a4a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertIsSorted_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertIsSorted_Test.java @@ -19,7 +19,7 @@ import static org.assertj.core.error.ShouldBeSorted.shouldBeSortedAccordingToGivenComparator; import static org.assertj.core.error.ShouldBeSorted.shouldHaveComparableElementsAccordingToGivenComparator; import static org.assertj.core.error.ShouldBeSorted.shouldHaveMutuallyComparableElements; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertIsSubsetOf_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertIsSubsetOf_Test.java index afc21679c9..996341427a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertIsSubsetOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertIsSubsetOf_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeSubsetOf.shouldBeSubsetOf; import static org.assertj.core.internal.ErrorMessages.iterableToLookForIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertNotEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertNotEmpty_Test.java index 16e420e02e..eae8765c3b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertNotEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertNotEmpty_Test.java @@ -16,8 +16,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeEmpty.shouldNotBeEmpty; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertNullOrEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertNullOrEmpty_Test.java index 585e0122ea..25c6be1ecc 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertNullOrEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertNullOrEmpty_Test.java @@ -15,8 +15,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeNullOrEmpty.shouldBeNullOrEmpty; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertStartsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertStartsWith_Test.java index c183ac94fc..7146645cb5 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertStartsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objectarrays/ObjectArrays_assertStartsWith_Test.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldStartWith.shouldStartWith; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertDoesNotHaveSameClassAs_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertDoesNotHaveSameClassAs_Test.java index 5c5ab4062d..2998dd3766 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertDoesNotHaveSameClassAs_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertDoesNotHaveSameClassAs_Test.java @@ -17,14 +17,14 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotHaveSameClass.shouldNotHaveSameClass; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Objects; import org.assertj.core.internal.ObjectsBaseTest; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Person; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertDoesNotHaveSameHashCodeAs_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertDoesNotHaveSameHashCodeAs_Test.java index 83415171f6..5e4ac6e574 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertDoesNotHaveSameHashCodeAs_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertDoesNotHaveSameHashCodeAs_Test.java @@ -15,14 +15,14 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotHaveSameHashCode.shouldNotHaveSameHashCode; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.ObjectsBaseTest; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertDoesNotHaveToString_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertDoesNotHaveToString_Test.java index 365341f76d..33c72928e2 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertDoesNotHaveToString_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertDoesNotHaveToString_Test.java @@ -14,14 +14,14 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.error.ShouldNotHaveToString.shouldNotHaveToString; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.ObjectsBaseTest; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Person; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertEqual_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertEqual_Test.java index 8222304805..1c44ac6364 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertEqual_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertEqual_Test.java @@ -16,8 +16,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEqual.shouldBeEqual; import static org.assertj.core.presentation.StandardRepresentation.STANDARD_REPRESENTATION; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasAllNullFieldsOrPropertiesExcept_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasAllNullFieldsOrPropertiesExcept_Test.java index 5b8c237204..4a9f1034da 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasAllNullFieldsOrPropertiesExcept_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasAllNullFieldsOrPropertiesExcept_Test.java @@ -15,7 +15,7 @@ import static java.util.Collections.emptyList; import static org.assertj.core.error.ShouldHaveAllNullFields.shouldHaveAllNullFields; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.Lists.list; @@ -25,8 +25,8 @@ import org.assertj.core.api.ThrowableAssert.ThrowingCallable; import org.assertj.core.internal.Objects; import org.assertj.core.internal.ObjectsBaseTest; -import org.assertj.core.test.Jedi; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Jedi; +import org.assertj.core.testkit.Person; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasFieldOrPropertyWithValue_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasFieldOrPropertyWithValue_Test.java index be6ac76034..2ba742486d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasFieldOrPropertyWithValue_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasFieldOrPropertyWithValue_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.error.ShouldHavePropertyOrField.shouldHavePropertyOrField; import static org.assertj.core.error.ShouldHavePropertyOrFieldWithValue.shouldHavePropertyOrFieldWithValue; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasFieldOrProperty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasFieldOrProperty_Test.java index dfff6bbf3e..c09e28723d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasFieldOrProperty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasFieldOrProperty_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.error.ShouldHavePropertyOrField.shouldHavePropertyOrField; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasOnlyFields_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasOnlyFields_Test.java index 5c71084753..204176e1ba 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasOnlyFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasOnlyFields_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainOnly.shouldContainOnly; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.list; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasSameClassAs_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasSameClassAs_Test.java index 056a982e4e..d148f6ce78 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasSameClassAs_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasSameClassAs_Test.java @@ -17,14 +17,14 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldHaveSameClass.shouldHaveSameClass; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Objects; import org.assertj.core.internal.ObjectsBaseTest; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Person; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasSameHashCodeAs_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasSameHashCodeAs_Test.java index 0d294975de..df794b7665 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasSameHashCodeAs_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasSameHashCodeAs_Test.java @@ -17,13 +17,13 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldHaveSameHashCode.shouldHaveSameHashCode; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.ObjectsBaseTest; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasToString_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasToString_Test.java index cc3d91809a..e18727118c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasToString_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertHasToString_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.error.ShouldHaveToString.shouldHaveToString; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.mock; @@ -23,7 +23,7 @@ import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.ObjectsBaseTest; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Person; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsEqualToComparingFieldByFieldRecursive_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsEqualToComparingFieldByFieldRecursive_Test.java index ff7119a067..5c3f41ec1c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsEqualToComparingFieldByFieldRecursive_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsEqualToComparingFieldByFieldRecursive_Test.java @@ -21,10 +21,10 @@ import static org.assertj.core.error.ShouldBeEqualByComparingFieldByFieldRecursively.shouldBeEqualByComparingFieldByFieldRecursive; import static org.assertj.core.internal.TypeComparators.defaultTypeComparators; import static org.assertj.core.internal.objects.SymmetricDateComparator.SYMMETRIC_DATE_COMPARATOR; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS; -import static org.assertj.core.test.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; -import static org.assertj.core.test.NeverEqualComparator.NEVER_EQUALS; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS; +import static org.assertj.core.testkit.AlwaysEqualComparator.ALWAYS_EQUALS_TIMESTAMP; +import static org.assertj.core.testkit.NeverEqualComparator.NEVER_EQUALS; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import java.sql.Timestamp; @@ -46,7 +46,7 @@ import org.assertj.core.internal.DeepDifference.Difference; import org.assertj.core.internal.ObjectsBaseTest; import org.assertj.core.internal.TypeComparators; -import org.assertj.core.test.Patient; +import org.assertj.core.testkit.Patient; import org.junit.jupiter.api.Test; public class Objects_assertIsEqualToComparingFieldByFieldRecursive_Test extends ObjectsBaseTest { diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsEqualToComparingOnlyGivenFields_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsEqualToComparingOnlyGivenFields_Test.java index 6d3e43e76a..a4bd8caaf2 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsEqualToComparingOnlyGivenFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsEqualToComparingOnlyGivenFields_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEqualByComparingOnlyGivenFields.shouldBeEqualComparingOnlyGivenFields; import static org.assertj.core.internal.TypeComparators.defaultTypeComparators; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; @@ -28,12 +28,12 @@ import org.assertj.core.api.AssertionInfo; import org.assertj.core.api.Assertions; import org.assertj.core.internal.ObjectsBaseTest; -import org.assertj.core.test.CartoonCharacter; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Jedi; -import org.assertj.core.test.Name; -import org.assertj.core.test.Person; -import org.assertj.core.test.Player; +import org.assertj.core.testkit.CartoonCharacter; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Jedi; +import org.assertj.core.testkit.Name; +import org.assertj.core.testkit.Person; +import org.assertj.core.testkit.Player; import org.assertj.core.util.introspection.IntrospectionError; import org.junit.jupiter.api.Test; @@ -176,7 +176,7 @@ void should_fail_when_selected_field_does_not_exist() { defaultTypeComparators(), "age"); }).withMessage(format("%nCan't find any field or property with name 'age'.%n" + "Error when introspecting properties was :%n" + - "- No getter for property 'age' in org.assertj.core.test.Jedi %n" + + "- No getter for property 'age' in org.assertj.core.testkit.Jedi %n" + "Error when introspecting fields was :%n" + "- Unable to obtain the value of the field <'age'> from ")); } diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsEqualToIgnoringGivenFields_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsEqualToIgnoringGivenFields_Test.java index 755b1d5dc0..e3cc5d1046 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsEqualToIgnoringGivenFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsEqualToIgnoringGivenFields_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEqualToIgnoringFields.shouldBeEqualToIgnoringGivenFields; import static org.assertj.core.internal.TypeComparators.defaultTypeComparators; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; @@ -33,11 +33,11 @@ import org.assertj.core.internal.ObjectsBaseTest; import org.assertj.core.internal.TypeComparators; import org.assertj.core.internal.objects.Objects_assertIsEqualToIgnoringGivenFields_Test.OuterClass.InnerClass; -import org.assertj.core.test.CartoonCharacter; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Jedi; -import org.assertj.core.test.Person; -import org.assertj.core.test.TestClassWithRandomId; +import org.assertj.core.testkit.CartoonCharacter; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Jedi; +import org.assertj.core.testkit.Person; +import org.assertj.core.testkit.TestClassWithRandomId; import org.assertj.core.util.introspection.IntrospectionError; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsEqualToIgnoringNullFields_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsEqualToIgnoringNullFields_Test.java index 3f05a41bd3..d688f5d688 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsEqualToIgnoringNullFields_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsEqualToIgnoringNullFields_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEqualToIgnoringFields.shouldBeEqualToIgnoringGivenFields; import static org.assertj.core.internal.TypeComparators.defaultTypeComparators; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; @@ -30,11 +30,11 @@ import org.assertj.core.internal.ObjectsBaseTest; import org.assertj.core.internal.TypeComparators; import org.assertj.core.internal.objects.Objects_assertIsEqualToIgnoringNullFields_Test.OuterClass.InnerClass; -import org.assertj.core.test.CartoonCharacter; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Jedi; -import org.assertj.core.test.Person; -import org.assertj.core.test.TestClassWithRandomId; +import org.assertj.core.testkit.CartoonCharacter; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Jedi; +import org.assertj.core.testkit.Person; +import org.assertj.core.testkit.TestClassWithRandomId; import org.assertj.core.util.introspection.IntrospectionError; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsExactlyInstanceOf_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsExactlyInstanceOf_Test.java index afe395fb10..640cbe73d0 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsExactlyInstanceOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsExactlyInstanceOf_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeExactlyInstanceOf.shouldBeExactlyInstance; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsIn_with_Iterable_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsIn_with_Iterable_Test.java index e51d2cad19..73c8107945 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsIn_with_Iterable_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsIn_with_Iterable_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldBeIn.shouldBeIn; import static org.assertj.core.internal.ErrorMessages.iterableIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.Lists.list; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsIn_with_array_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsIn_with_array_Test.java index 6fa0bf4899..431197d1c3 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsIn_with_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsIn_with_array_Test.java @@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldBeIn.shouldBeIn; import static org.assertj.core.internal.ErrorMessages.arrayIsNull; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsInstanceOfAny_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsInstanceOfAny_Test.java index 27151733cc..1d245a8138 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsInstanceOfAny_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsInstanceOfAny_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeInstanceOfAny.shouldBeInstanceOfAny; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; @@ -27,7 +27,7 @@ import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Objects; import org.assertj.core.internal.ObjectsBaseTest; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Person; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsInstanceOf_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsInstanceOf_Test.java index 8885fe0d70..b143f17626 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsInstanceOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsInstanceOf_Test.java @@ -17,14 +17,14 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeInstance.shouldBeInstance; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Objects; import org.assertj.core.internal.ObjectsBaseTest; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Person; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsNotExactlyInstanceOf_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsNotExactlyInstanceOf_Test.java index 4dd39d55f4..21143f447d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsNotExactlyInstanceOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsNotExactlyInstanceOf_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeExactlyInstanceOf.shouldNotBeExactlyInstance; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsNotIn_with_Iterable_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsNotIn_with_Iterable_Test.java index 079eb6638f..0e78b28fe4 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsNotIn_with_Iterable_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsNotIn_with_Iterable_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldNotBeIn.shouldNotBeIn; import static org.assertj.core.internal.ErrorMessages.iterableIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsNotIn_with_array_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsNotIn_with_array_Test.java index eaca89ca3e..fc209d4a11 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsNotIn_with_array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsNotIn_with_array_Test.java @@ -16,8 +16,8 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldNotBeIn.shouldNotBeIn; import static org.assertj.core.internal.ErrorMessages.arrayIsNull; -import static org.assertj.core.test.ObjectArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ObjectArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsNotInstanceOfAny_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsNotInstanceOfAny_Test.java index 851815f87d..12aa8b8a26 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsNotInstanceOfAny_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsNotInstanceOfAny_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeInstanceOfAny.shouldNotBeInstanceOfAny; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; @@ -27,7 +27,7 @@ import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Objects; import org.assertj.core.internal.ObjectsBaseTest; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Person; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsNotInstanceOf_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsNotInstanceOf_Test.java index b2064dce80..2c714ce081 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsNotInstanceOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsNotInstanceOf_Test.java @@ -16,14 +16,14 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; import static org.assertj.core.error.ShouldNotBeInstance.shouldNotBeInstance; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Objects; import org.assertj.core.internal.ObjectsBaseTest; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Person; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsNotOfClassIn_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsNotOfClassIn_Test.java index fd909be02a..63d3de4f1c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsNotOfClassIn_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsNotOfClassIn_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeOfClassIn.shouldNotBeOfClassIn; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; @@ -26,7 +26,7 @@ import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Objects; import org.assertj.core.internal.ObjectsBaseTest; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Person; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsOfClassIn_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsOfClassIn_Test.java index 9d09fe053a..e74cfd1950 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsOfClassIn_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertIsOfClassIn_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeOfClassIn.shouldBeOfClassIn; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; @@ -26,7 +26,7 @@ import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Objects; import org.assertj.core.internal.ObjectsBaseTest; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Person; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertNotEqual_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertNotEqual_Test.java index b4644964cb..3d1c876131 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertNotEqual_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertNotEqual_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeEqual.shouldNotBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertNotNull_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertNotNull_Test.java index 30f615679f..ede1740308 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertNotNull_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertNotNull_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertNotNull_with_label_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertNotNull_with_label_Test.java index 0a2a70f5d2..1005630b29 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertNotNull_with_label_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertNotNull_with_label_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.objects; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertNotSame_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertNotSame_Test.java index 98118e112a..67015be902 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertNotSame_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertNotSame_Test.java @@ -15,12 +15,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeSame.shouldNotBeSame; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.ObjectsBaseTest; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Person; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertNull_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertNull_Test.java index 4c687dac53..9f7c466b5e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertNull_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertNull_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEqual.shouldBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertSame_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertSame_Test.java index feb28eeb8e..9c8d18ce72 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertSame_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/objects/Objects_assertSame_Test.java @@ -15,13 +15,13 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeSame.shouldBeSame; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Objects; import org.assertj.core.internal.ObjectsBaseTest; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Person; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContainsAnyOf_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContainsAnyOf_Test.java index 7818886da7..008b5dbefc 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContainsAnyOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContainsAnyOf_Test.java @@ -12,7 +12,7 @@ */ package org.assertj.core.internal.shortarrays; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContainsExactlyInAnyOrder_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContainsExactlyInAnyOrder_Test.java index 67460721af..eaf306847f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContainsExactlyInAnyOrder_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContainsExactlyInAnyOrder_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainExactlyInAnyOrder.shouldContainExactlyInAnyOrder; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ShortArrays.arrayOf; -import static org.assertj.core.test.ShortArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContainsExactly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContainsExactly_Test.java index 29a6c3b2f4..0236d6876b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContainsExactly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContainsExactly_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.error.ShouldContainExactly.elementsDifferAtIndex; import static org.assertj.core.error.ShouldContainExactly.shouldContainExactly; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ShortArrays.arrayOf; -import static org.assertj.core.test.ShortArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.asList; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContainsOnlyOnce_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContainsOnlyOnce_Test.java index 2006c5decf..62331a25f0 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContainsOnlyOnce_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContainsOnlyOnce_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainsOnlyOnce.shouldContainsOnlyOnce; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ShortArrays.arrayOf; -import static org.assertj.core.test.ShortArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContainsOnly_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContainsOnly_Test.java index 783e3fd374..3fc5b2bfc0 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContainsOnly_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContainsOnly_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainOnly.shouldContainOnly; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ShortArrays.arrayOf; -import static org.assertj.core.test.ShortArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.newArrayList; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContainsSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContainsSequence_Test.java index e80dd27387..768063cb5b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContainsSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContainsSequence_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldContainSequence.shouldContainSequence; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ShortArrays.arrayOf; -import static org.assertj.core.test.ShortArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContains_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContains_Test.java index 60feb5fcd0..cfc738a7b2 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContains_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContains_Test.java @@ -12,8 +12,8 @@ */ package org.assertj.core.internal.shortarrays; -import static org.assertj.core.test.ShortArrays.arrayOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ShortArrays.arrayOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContains_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContains_at_Index_Test.java index 3dd58b0b9b..d3e1895e40 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContains_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertContains_at_Index_Test.java @@ -19,9 +19,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldContainAtIndex.shouldContainAtIndex; -import static org.assertj.core.test.ShortArrays.emptyArray; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ShortArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsEmpty; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertDoesNotContain_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertDoesNotContain_Test.java index e0164f2243..e0f18687a0 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertDoesNotContain_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertDoesNotContain_Test.java @@ -20,9 +20,9 @@ import static org.assertj.core.error.ShouldNotContain.shouldNotContain; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsEmpty; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ShortArrays.arrayOf; -import static org.assertj.core.test.ShortArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertDoesNotContain_at_Index_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertDoesNotContain_at_Index_Test.java index e335329b8c..65b641bad1 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertDoesNotContain_at_Index_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertDoesNotContain_at_Index_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.data.Index.atIndex; import static org.assertj.core.error.ShouldNotContainAtIndex.shouldNotContainAtIndex; -import static org.assertj.core.test.ShortArrays.emptyArray; -import static org.assertj.core.test.TestData.someIndex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ShortArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someIndex; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertDoesNotHaveDuplicates_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertDoesNotHaveDuplicates_Test.java index 74b7f392fc..93b11b6446 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertDoesNotHaveDuplicates_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertDoesNotHaveDuplicates_Test.java @@ -16,9 +16,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotHaveDuplicates.shouldNotHaveDuplicates; -import static org.assertj.core.test.ShortArrays.arrayOf; -import static org.assertj.core.test.ShortArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertEmpty_Test.java index 0d24af58f5..be03798071 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertEmpty_Test.java @@ -16,8 +16,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEmpty.shouldBeEmpty; -import static org.assertj.core.test.ShortArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ShortArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertEndsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertEndsWith_Test.java index 5963450403..f10d1bbc41 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertEndsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertEndsWith_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldEndWith.shouldEndWith; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ShortArrays.arrayOf; -import static org.assertj.core.test.ShortArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSameSizeAs_with_Array_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSameSizeAs_with_Array_Test.java index eef07e691b..438a21b76c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSameSizeAs_with_Array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSameSizeAs_with_Array_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.shortarrays; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSameSizeAs_with_Iterable_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSameSizeAs_with_Iterable_Test.java index b57da4e884..d151b02e5b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSameSizeAs_with_Iterable_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSameSizeAs_with_Iterable_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.shortarrays; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.list; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSizeBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSizeBetween_Test.java index 45ea6b8410..a59b562c53 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSizeBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSizeBetween_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.error.ShouldHaveSizeBetween.shouldHaveSizeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.ShortArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSizeGreaterThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSizeGreaterThanOrEqualTo_Test.java index e0f59578ac..de908181a6 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSizeGreaterThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSizeGreaterThanOrEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeGreaterThanOrEqualTo.shouldHaveSizeGreaterThanOrEqualTo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.ShortArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSizeGreaterThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSizeGreaterThan_Test.java index 2d528b78bc..ea84a78493 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSizeGreaterThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSizeGreaterThan_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeGreaterThan.shouldHaveSizeGreaterThan; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.ShortArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSizeLessThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSizeLessThanOrEqualTo_Test.java index dd1e26a93f..a7265c7314 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSizeLessThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSizeLessThanOrEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeLessThanOrEqualTo.shouldHaveSizeLessThanOrEqualTo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.ShortArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSizeLessThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSizeLessThan_Test.java index d8dc3bd853..15d0c04eac 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSizeLessThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSizeLessThan_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeLessThan.shouldHaveSizeLessThan; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.ShortArraysBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSize_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSize_Test.java index a1b8537a1a..77ff54ab0f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSize_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertHasSize_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSize.shouldHaveSize; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertIsSortedAccordingToComparator_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertIsSortedAccordingToComparator_Test.java index d91560bcca..9d131390a5 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertIsSortedAccordingToComparator_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertIsSortedAccordingToComparator_Test.java @@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeSorted.shouldBeSortedAccordingToGivenComparator; -import static org.assertj.core.test.ShortArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ShortArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertIsSorted_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertIsSorted_Test.java index 25dffe4b51..4a59476686 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertIsSorted_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertIsSorted_Test.java @@ -17,9 +17,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeSorted.shouldBeSorted; import static org.assertj.core.error.ShouldBeSorted.shouldBeSortedAccordingToGivenComparator; -import static org.assertj.core.test.ShortArrays.arrayOf; -import static org.assertj.core.test.ShortArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertNotEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertNotEmpty_Test.java index 55f5745baf..a16c2c6c8a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertNotEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertNotEmpty_Test.java @@ -16,9 +16,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeEmpty.shouldNotBeEmpty; -import static org.assertj.core.test.ShortArrays.arrayOf; -import static org.assertj.core.test.ShortArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertNullOrEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertNullOrEmpty_Test.java index e14d18af1f..1dcfd3aeae 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertNullOrEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertNullOrEmpty_Test.java @@ -15,8 +15,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeNullOrEmpty.shouldBeNullOrEmpty; -import static org.assertj.core.test.ShortArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ShortArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertStartsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertStartsWith_Test.java index 097676bd85..ca8e5dc449 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertStartsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shortarrays/ShortArrays_assertStartsWith_Test.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldStartWith.shouldStartWith; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.ShortArrays.arrayOf; -import static org.assertj.core.test.ShortArrays.emptyArray; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ShortArrays.arrayOf; +import static org.assertj.core.testkit.ShortArrays.emptyArray; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertEqual_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertEqual_Test.java index 728e6b60c0..b094a55bda 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertEqual_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertEqual_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEqual.shouldBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertGreaterThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertGreaterThanOrEqualTo_Test.java index 1727636896..afe2ee2239 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertGreaterThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertGreaterThanOrEqualTo_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeGreaterOrEqual.shouldBeGreaterOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertGreaterThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertGreaterThan_Test.java index 37dc7afda9..7cec630f77 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertGreaterThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertGreaterThan_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeGreater.shouldBeGreater; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsBetween_Test.java index 2ad8764684..e97daa6973 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsBetween_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeBetween.shouldBeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsCloseToPercentage_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsCloseToPercentage_Test.java index 3ef58aa012..a35092a196 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsCloseToPercentage_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsCloseToPercentage_Test.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.withinPercentage; import static org.assertj.core.data.Percentage.withPercentage; import static org.assertj.core.error.ShouldBeEqualWithinPercentage.shouldBeEqualWithinPercentage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsCloseTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsCloseTo_Test.java index 72e417c11b..0f284b5d2d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsCloseTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsCloseTo_Test.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.Assertions.within; import static org.assertj.core.error.ShouldBeEqualWithinOffset.shouldBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsEven_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsEven_Test.java index be0c50da38..0a199aa3db 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsEven_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsEven_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeEven.shouldBeEven; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsNegative_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsNegative_Test.java index 36078e1486..749ca68b45 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsNegative_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsNegative_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeLess.shouldBeLess; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsNotCloseToPercentage_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsNotCloseToPercentage_Test.java index 04b3e560cb..5c458288f7 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsNotCloseToPercentage_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsNotCloseToPercentage_Test.java @@ -21,7 +21,7 @@ import static org.assertj.core.api.Assertions.withinPercentage; import static org.assertj.core.data.Percentage.withPercentage; import static org.assertj.core.error.ShouldNotBeEqualWithinPercentage.shouldNotBeEqualWithinPercentage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsNotCloseTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsNotCloseTo_Test.java index be38214d17..449ab5858a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsNotCloseTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsNotCloseTo_Test.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.Assertions.within; import static org.assertj.core.error.ShouldNotBeEqualWithinOffset.shouldNotBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsNotNegative_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsNotNegative_Test.java index 7312c70b49..bcd7648801 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsNotNegative_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsNotNegative_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Shorts; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsNotPositive_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsNotPositive_Test.java index d37e694cbc..2c450bd70b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsNotPositive_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsNotPositive_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeLessOrEqual.shouldBeLessOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.internal.ShortsBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsNotZero_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsNotZero_Test.java index 09d426bea0..1421b8bd6e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsNotZero_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsNotZero_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Shorts; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsOdd_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsOdd_Test.java index 8e600a46af..e3521a51cc 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsOdd_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsOdd_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeOdd.shouldBeOdd; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsOne_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsOne_Test.java index 3ddd5d6a66..6a94e1e1d6 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsOne_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsOne_Test.java @@ -13,8 +13,8 @@ package org.assertj.core.internal.shorts; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Shorts; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsPositive_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsPositive_Test.java index fb3ba68396..45bceea4eb 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsPositive_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsPositive_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Shorts; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsStrictlyBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsStrictlyBetween_Test.java index 664dc00a31..6fc1ebe138 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsStrictlyBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsStrictlyBetween_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeBetween.shouldBeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsZero_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsZero_Test.java index 181c60c1cc..4d43fd9d6c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsZero_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertIsZero_Test.java @@ -13,8 +13,8 @@ package org.assertj.core.internal.shorts; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.api.AssertionInfo; import org.assertj.core.internal.Shorts; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertLessThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertLessThanOrEqualTo_Test.java index 0aec001d63..dc3ad28a48 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertLessThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertLessThanOrEqualTo_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeLessOrEqual.shouldBeLessOrEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertLessThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertLessThan_Test.java index 236fbddea4..4aa5f45d4f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertLessThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertLessThan_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeLess.shouldBeLess; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertNotEqual_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertNotEqual_Test.java index 1c1389b459..e91e639192 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertNotEqual_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/shorts/Shorts_assertNotEqual_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeEqual.shouldNotBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/spliterator/Spliterators_assertHasCharacteristics_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/spliterator/Spliterators_assertHasCharacteristics_Test.java index 2206c1bc41..6197b14763 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/spliterator/Spliterators_assertHasCharacteristics_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/spliterator/Spliterators_assertHasCharacteristics_Test.java @@ -23,7 +23,7 @@ import org.assertj.core.api.SpliteratorAssert; import org.assertj.core.internal.SpliteratorsBaseTest; -import org.assertj.core.test.StringSpliterator; +import org.assertj.core.testkit.StringSpliterator; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/spliterator/Spliterators_assertHasOnlyCharacteristics_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/spliterator/Spliterators_assertHasOnlyCharacteristics_Test.java index fb3600c06b..55de2945b0 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/spliterator/Spliterators_assertHasOnlyCharacteristics_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/spliterator/Spliterators_assertHasOnlyCharacteristics_Test.java @@ -24,7 +24,7 @@ import org.assertj.core.api.SpliteratorAssert; import org.assertj.core.internal.SpliteratorsBaseTest; -import org.assertj.core.test.StringSpliterator; +import org.assertj.core.testkit.StringSpliterator; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsAnyOf_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsAnyOf_Test.java index 309b5bba95..d29600a128 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsAnyOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsAnyOf_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldContainAnyOf.shouldContainAnyOf; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsIgnoringCase_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsIgnoringCase_Test.java index 4d44db20c6..9c28b0cc42 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsIgnoringCase_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsIgnoringCase_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldContainCharSequence.shouldContainIgnoringCase; import static org.assertj.core.internal.ErrorMessages.charSequenceToLookForIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsIgnoringNewLines_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsIgnoringNewLines_Test.java index 0b71b592f0..afce3c0ea4 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsIgnoringNewLines_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsIgnoringNewLines_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldContainCharSequence.containsIgnoringNewLines; import static org.assertj.core.internal.ErrorMessages.charSequenceToLookForIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsOnlyDigits_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsOnlyDigits_Test.java index 9df35acd04..19b4b88f62 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsOnlyDigits_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsOnlyDigits_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldContainOnlyDigits.shouldContainOnlyDigits; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsOnlyOnce_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsOnlyOnce_Test.java index e7748da123..8ffafca252 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsOnlyOnce_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsOnlyOnce_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldContainCharSequenceOnlyOnce.shouldContainOnlyOnce; import static org.assertj.core.internal.ErrorMessages.charSequenceToLookForIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsPattern_CharSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsPattern_CharSequence_Test.java index 40bc6a8232..b5a4dff4eb 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsPattern_CharSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsPattern_CharSequence_Test.java @@ -16,8 +16,8 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldContainPattern.shouldContainPattern; import static org.assertj.core.internal.ErrorMessages.regexPatternIsNull; -import static org.assertj.core.test.TestData.matchAnything; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.matchAnything; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import java.util.regex.PatternSyntaxException; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsPattern_Pattern_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsPattern_Pattern_Test.java index 3fc14ee9fe..eaabba686f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsPattern_Pattern_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsPattern_Pattern_Test.java @@ -16,8 +16,8 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldContainPattern.shouldContainPattern; import static org.assertj.core.internal.ErrorMessages.regexPatternIsNull; -import static org.assertj.core.test.TestData.matchAnything; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.matchAnything; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import java.util.regex.Pattern; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsSequence_Test.java index 8a1be199df..dca1765ac7 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsSequence_Test.java @@ -19,7 +19,7 @@ import static org.assertj.core.error.ShouldContainSequenceOfCharSequence.shouldContainSequence; import static org.assertj.core.internal.ErrorMessages.arrayOfValuesToLookForIsEmpty; import static org.assertj.core.internal.ErrorMessages.arrayOfValuesToLookForIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsSubsequence_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsSubsequence_Test.java index 2e68b3767b..d55d1e7e39 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsSubsequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsSubsequence_Test.java @@ -20,8 +20,8 @@ import static org.assertj.core.error.ShouldContainSubsequenceOfCharSequence.shouldContainSubsequence; import static org.assertj.core.internal.ErrorMessages.arrayOfValuesToLookForIsEmpty; import static org.assertj.core.internal.ErrorMessages.arrayOfValuesToLookForIsNull; -import static org.assertj.core.test.Maps.mapOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.Maps.mapOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContains_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContains_Test.java index 0ef906fe34..351ba8eee0 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContains_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertContains_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldContainCharSequence.shouldContain; import static org.assertj.core.internal.ErrorMessages.charSequenceToLookForIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Sets.newLinkedHashSet; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotContainIgnoringCase_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotContainIgnoringCase_Test.java index 9b332f1b26..688f8c83de 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotContainIgnoringCase_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotContainIgnoringCase_Test.java @@ -18,7 +18,7 @@ import static org.assertj.core.error.ShouldNotContainCharSequence.shouldNotContainIgnoringCase; import static org.assertj.core.internal.ErrorMessages.arrayOfValuesToLookForIsEmpty; import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotContainPattern_CharSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotContainPattern_CharSequence_Test.java index 82da4e8e6d..9a7e2d4f50 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotContainPattern_CharSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotContainPattern_CharSequence_Test.java @@ -16,8 +16,8 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldNotContainPattern.shouldNotContainPattern; import static org.assertj.core.internal.ErrorMessages.regexPatternIsNull; -import static org.assertj.core.test.TestData.matchAnything; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.matchAnything; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import java.util.regex.PatternSyntaxException; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotContainPattern_Pattern_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotContainPattern_Pattern_Test.java index 8540c54290..f9c54508f4 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotContainPattern_Pattern_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotContainPattern_Pattern_Test.java @@ -16,8 +16,8 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldNotContainPattern.shouldNotContainPattern; import static org.assertj.core.internal.ErrorMessages.regexPatternIsNull; -import static org.assertj.core.test.TestData.matchAnything; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.matchAnything; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import java.util.regex.Pattern; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotContain_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotContain_Test.java index 455923521d..1c3209bd72 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotContain_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotContain_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldNotContainCharSequence.shouldNotContain; import static org.assertj.core.internal.ErrorMessages.arrayOfValuesToLookForIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.internal.util.collections.Sets.newSet; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotEndWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotEndWith_Test.java index aa296bc7ed..c99cd14238 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotEndWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotEndWith_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldNotEndWith.shouldNotEndWith; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotMatch_CharSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotMatch_CharSequence_Test.java index 4fb3c5b2cd..d94d4495b1 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotMatch_CharSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotMatch_CharSequence_Test.java @@ -16,8 +16,8 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldNotMatchPattern.shouldNotMatch; import static org.assertj.core.internal.ErrorMessages.regexPatternIsNull; -import static org.assertj.core.test.TestData.matchAnything; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.matchAnything; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import java.util.regex.PatternSyntaxException; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotMatch_Pattern_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotMatch_Pattern_Test.java index 04609b332c..43d22569a5 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotMatch_Pattern_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotMatch_Pattern_Test.java @@ -16,8 +16,8 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldNotMatchPattern.shouldNotMatch; import static org.assertj.core.internal.ErrorMessages.regexPatternIsNull; -import static org.assertj.core.test.TestData.matchAnything; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.matchAnything; +import static org.assertj.core.testkit.TestData.someInfo; import java.util.regex.Pattern; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotStartWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotStartWith_Test.java index ab15cf59be..fb0180a1b8 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotStartWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertDoesNotStartWith_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldNotStartWith.shouldNotStartWith; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEmpty_Test.java index dcdb5b5896..9d4ca9babd 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEmpty_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldBeEmpty.shouldBeEmpty; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEndsWithIgnoringCase_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEndsWithIgnoringCase_Test.java index 4b119dc294..362c673c37 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEndsWithIgnoringCase_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEndsWithIgnoringCase_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldEndWithIgnoringCase.shouldEndWithIgnoringCase; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEndsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEndsWith_Test.java index d6f16544e3..ea0ef2e8d2 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEndsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEndsWith_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldEndWith.shouldEndWith; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEqualsIgnoringCase_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEqualsIgnoringCase_Test.java index 8cd4b7a427..e27690b43c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEqualsIgnoringCase_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEqualsIgnoringCase_Test.java @@ -14,8 +14,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldBeEqualIgnoringCase.shouldBeEqual; -import static org.assertj.core.test.CharArrays.arrayOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.CharArrays.arrayOf; +import static org.assertj.core.testkit.TestData.someInfo; import org.assertj.core.internal.StringsBaseTest; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEqualsIgnoringWhitespace_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEqualsIgnoringWhitespace_Test.java index 68a58c8770..e0eb4f4fc6 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEqualsIgnoringWhitespace_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEqualsIgnoringWhitespace_Test.java @@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEqualIgnoringWhitespace.shouldBeEqualIgnoringWhitespace; import static org.assertj.core.internal.ErrorMessages.charSequenceToLookForIsNull; -import static org.assertj.core.test.CharArrays.arrayOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.CharArrays.arrayOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import java.util.stream.Stream; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEqualsNormalizingPunctuationAndWhitespace_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEqualsNormalizingPunctuationAndWhitespace_Test.java index 7f0fae92e1..a2bd7b36a7 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEqualsNormalizingPunctuationAndWhitespace_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEqualsNormalizingPunctuationAndWhitespace_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.strings; import static org.assertj.core.error.ShouldBeEqualNormalizingPunctuationAndWhitespace.shouldBeEqualNormalizingPunctuationAndWhitespace; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEqualsNormalizingUnicode_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEqualsNormalizingUnicode_Test.java index e82133ceab..4fd52ecaf2 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEqualsNormalizingUnicode_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEqualsNormalizingUnicode_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldBeEqualNormalizingUnicode.shouldBeEqualNormalizingUnicode; import static org.assertj.core.internal.ErrorMessages.charSequenceToLookForIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEqualsNormalizingWhitespace_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEqualsNormalizingWhitespace_Test.java index 3ad0b1b305..d623f221a4 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEqualsNormalizingWhitespace_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertEqualsNormalizingWhitespace_Test.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldBeEqualNormalizingWhitespace.shouldBeEqualNormalizingWhitespace; import static org.assertj.core.internal.ErrorMessages.charSequenceToLookForIsNull; -import static org.assertj.core.test.CharArrays.arrayOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.CharArrays.arrayOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.junit.jupiter.params.provider.Arguments.arguments; import java.util.stream.Stream; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasLinesCount_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasLinesCount_Test.java index 30aa7eac10..df2374311e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasLinesCount_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasLinesCount_Test.java @@ -15,7 +15,7 @@ import static java.lang.System.lineSeparator; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveLineCount.shouldHaveLinesCount; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSameSizeAs_with_Array_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSameSizeAs_with_Array_Test.java index 1ea59825c9..6a45d86f0c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSameSizeAs_with_Array_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSameSizeAs_with_Array_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.strings; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.Arrays.array; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSameSizeAs_with_CharSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSameSizeAs_with_CharSequence_Test.java index 99251e2209..9ea9246bad 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSameSizeAs_with_CharSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSameSizeAs_with_CharSequence_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.strings; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSameSizeAs_with_Iterable_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSameSizeAs_with_Iterable_Test.java index df00385398..0d2578718d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSameSizeAs_with_Iterable_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSameSizeAs_with_Iterable_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.strings; import static org.assertj.core.error.ShouldHaveSameSizeAs.shouldHaveSameSizeAs; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.Lists.list; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSizeBetween_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSizeBetween_Test.java index 0ff256a99c..1034a5d457 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSizeBetween_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSizeBetween_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.error.ShouldHaveSizeBetween.shouldHaveSizeBetween; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSizeGreaterThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSizeGreaterThanOrEqualTo_Test.java index 883174727d..4de5282230 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSizeGreaterThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSizeGreaterThanOrEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeGreaterThanOrEqualTo.shouldHaveSizeGreaterThanOrEqualTo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSizeGreaterThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSizeGreaterThan_Test.java index 1425a8f051..057e878706 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSizeGreaterThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSizeGreaterThan_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeGreaterThan.shouldHaveSizeGreaterThan; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSizeLessThanOrEqualTo_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSizeLessThanOrEqualTo_Test.java index 35b56a5aeb..d951cfdd19 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSizeLessThanOrEqualTo_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSizeLessThanOrEqualTo_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeLessThanOrEqualTo.shouldHaveSizeLessThanOrEqualTo; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSizeLessThan_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSizeLessThan_Test.java index b2aa99b5f2..2c2290998c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSizeLessThan_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSizeLessThan_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSizeLessThan.shouldHaveSizeLessThan; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSize_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSize_Test.java index 3e6ee990c8..ef82001590 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSize_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertHasSize_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldHaveSize.shouldHaveSize; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsBase64_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsBase64_Test.java index 2d672d833d..de262ed804 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsBase64_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsBase64_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeBase64.shouldBeBase64; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsEqualToIgnoringNewLines_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsEqualToIgnoringNewLines_Test.java index 8b0d84e409..49d670c0db 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsEqualToIgnoringNewLines_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsEqualToIgnoringNewLines_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.strings; import static org.assertj.core.error.ShouldBeEqualIgnoringNewLines.shouldBeEqualIgnoringNewLines; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsEqualToNormalizingNewlines_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsEqualToNormalizingNewlines_Test.java index d5fcb9c491..ff7ad8b471 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsEqualToNormalizingNewlines_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsEqualToNormalizingNewlines_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.strings; import static org.assertj.core.error.ShouldBeEqualIgnoringNewLineDifferences.shouldBeEqualIgnoringNewLineDifferences; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsLowerCase_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsLowerCase_Test.java index 8a58df0e7f..4e9602ccd5 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsLowerCase_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsLowerCase_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldBeLowerCase.shouldBeLowerCase; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.StringsBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsMixedCase_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsMixedCase_Test.java index 6fcf7cbc44..5bf90d1b05 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsMixedCase_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsMixedCase_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldBeMixedCase.shouldBeMixedCase; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.internal.StringsBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsSubstringOf_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsSubstringOf_Test.java index feaeee5fed..d1a2bed219 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsSubstringOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsSubstringOf_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldBeSubstring.shouldBeSubstring; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.StandardComparisonStrategy; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsUpperCase_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsUpperCase_Test.java index 4e245ee0bc..677495a417 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsUpperCase_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsUpperCase_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldBeUpperCase.shouldBeUpperCase; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import org.assertj.core.internal.StringsBaseTest; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsXmlEqualCase_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsXmlEqualCase_Test.java index 9c7a64bded..97941dc412 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsXmlEqualCase_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertIsXmlEqualCase_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeEqual.shouldBeEqual; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.assertj.core.util.xml.XmlStringPrettyFormatter.xmlPrettyFormat; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertMatches_CharSequence_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertMatches_CharSequence_Test.java index 3c2fc3df9c..f9015a2464 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertMatches_CharSequence_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertMatches_CharSequence_Test.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldMatchPattern.shouldMatch; import static org.assertj.core.internal.ErrorMessages.regexPatternIsNull; -import static org.assertj.core.test.TestData.matchAnything; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.matchAnything; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertMatches_Pattern_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertMatches_Pattern_Test.java index 58b6c18afd..509b73db7a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertMatches_Pattern_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertMatches_Pattern_Test.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldMatchPattern.shouldMatch; import static org.assertj.core.internal.ErrorMessages.regexPatternIsNull; -import static org.assertj.core.test.TestData.matchAnything; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.matchAnything; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertNotEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertNotEmpty_Test.java index 598cfcba2d..0cbb108175 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertNotEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertNotEmpty_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeEmpty.shouldNotBeEmpty; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertNotEqualsIgnoringCase_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertNotEqualsIgnoringCase_Test.java index 5eab832f66..c7f7ce03f0 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertNotEqualsIgnoringCase_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertNotEqualsIgnoringCase_Test.java @@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldNotBeEqualIgnoringCase.shouldNotBeEqualIgnoringCase; -import static org.assertj.core.test.CharArrays.arrayOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.CharArrays.arrayOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertNotEqualsIgnoringWhitespace_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertNotEqualsIgnoringWhitespace_Test.java index c03523a51b..98e8a747cf 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertNotEqualsIgnoringWhitespace_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertNotEqualsIgnoringWhitespace_Test.java @@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldNotBeEqualIgnoringWhitespace.shouldNotBeEqualIgnoringWhitespace; import static org.assertj.core.internal.ErrorMessages.charSequenceToLookForIsNull; -import static org.assertj.core.test.CharArrays.arrayOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.CharArrays.arrayOf; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import java.util.stream.Stream; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertNotEqualsNormalizingWhitespace_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertNotEqualsNormalizingWhitespace_Test.java index f3989f9938..4688d62c7a 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertNotEqualsNormalizingWhitespace_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertNotEqualsNormalizingWhitespace_Test.java @@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldNotBeEqualNormalizingWhitespace.shouldNotBeEqualNormalizingWhitespace; import static org.assertj.core.internal.ErrorMessages.charSequenceToLookForIsNull; -import static org.assertj.core.test.CharArrays.arrayOf; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.CharArrays.arrayOf; +import static org.assertj.core.testkit.TestData.someInfo; import java.util.stream.Stream; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertNullOrEmpty_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertNullOrEmpty_Test.java index 2bbc534311..33bc7ab84f 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertNullOrEmpty_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertNullOrEmpty_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldBeNullOrEmpty.shouldBeNullOrEmpty; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertStartsWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertStartsWith_Test.java index e4f58dff95..e0d3c223a4 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertStartsWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/strings/Strings_assertStartsWith_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldStartWith.shouldStartWith; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasCauseExactlyInstanceOf_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasCauseExactlyInstanceOf_Test.java index 38c7e6ac4d..15ddf6d39e 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasCauseExactlyInstanceOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasCauseExactlyInstanceOf_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldHaveCauseExactlyInstance.shouldHaveCauseExactlyInstance; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasCauseReference_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasCauseReference_Test.java index dfc69da2e8..826d82ce7b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasCauseReference_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasCauseReference_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.error.ShouldHaveCauseReference.shouldHaveCauseReference; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasCause_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasCause_Test.java index e771c51ba3..f097211279 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasCause_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasCause_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldHaveCause.shouldHaveCause; import static org.assertj.core.error.ShouldHaveNoCause.shouldHaveNoCause; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageContainingAll_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageContainingAll_Test.java index cdd4279c86..770b143ada 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageContainingAll_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageContainingAll_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldContainCharSequence.shouldContain; import static org.assertj.core.internal.ErrorMessages.charSequenceToLookForIsNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageContaining_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageContaining_Test.java index f1f73197fc..42511c467b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageContaining_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageContaining_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.error.ShouldContainCharSequence.shouldContain; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageEnding_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageEnding_Test.java index 9e2514e204..cd626a0bb5 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageEnding_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageEnding_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.fail; import static org.assertj.core.error.ShouldEndWith.shouldEndWith; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageFindingMatch_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageFindingMatch_Test.java index c92dc19f10..498b88b84c 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageFindingMatch_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageFindingMatch_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.error.ShouldHaveMessageFindingMatchRegex.shouldHaveMessageFindingMatchRegex; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageMatching_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageMatching_Test.java index ccea07cc7a..8594e3c30d 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageMatching_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageMatching_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.fail; import static org.assertj.core.error.ShouldHaveMessageMatchingRegex.shouldHaveMessageMatchingRegex; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.mockito.Mockito.verify; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageNotContainingAny_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageNotContainingAny_Test.java index b0c1c54397..e92c7e5363 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageNotContainingAny_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageNotContainingAny_Test.java @@ -14,7 +14,7 @@ import static java.util.Collections.singleton; import static org.assertj.core.error.ShouldNotContainCharSequence.shouldNotContain; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageNotContaining_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageNotContaining_Test.java index 40fa784d1a..4aeb335dc9 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageNotContaining_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageNotContaining_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.throwables; import static org.assertj.core.error.ShouldNotContainCharSequence.shouldNotContain; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageStartingWith_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageStartingWith_Test.java index ab288eff43..009d3742de 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageStartingWith_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessageStartingWith_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.fail; import static org.assertj.core.error.ShouldStartWith.shouldStartWith; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessage_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessage_Test.java index 2d6bd68728..ec849dd3dc 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessage_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasMessage_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.throwables; import static org.assertj.core.error.ShouldHaveMessage.shouldHaveMessage; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.assertThatAssertionErrorIsThrownBy; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasNoCause_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasNoCause_Test.java index e628fb6f39..0476f4ff61 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasNoCause_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasNoCause_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.fail; import static org.assertj.core.error.ShouldHaveNoCause.shouldHaveNoCause; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasNoSuppressedExceptions_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasNoSuppressedExceptions_Test.java index 413b8540f6..86a0def368 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasNoSuppressedExceptions_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasNoSuppressedExceptions_Test.java @@ -13,7 +13,7 @@ package org.assertj.core.internal.throwables; import static org.assertj.core.error.ShouldHaveNoSuppressedExceptions.shouldHaveNoSuppressedExceptions; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasRootCauseMessage_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasRootCauseMessage_Test.java index db455c1fe2..dfcd16221b 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasRootCauseMessage_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasRootCauseMessage_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.error.ShouldHaveRootCause.shouldHaveRootCauseWithMessage; import static org.assertj.core.error.ShouldNotBeNull.shouldNotBeNull; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import org.assertj.core.api.AssertionInfo; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasRootCause_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasRootCause_Test.java index 5ee64205e7..641540d6e3 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasRootCause_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasRootCause_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.error.ShouldHaveNoCause.shouldHaveNoCause; import static org.assertj.core.error.ShouldHaveRootCause.shouldHaveRootCause; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasStackTraceContaining_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasStackTraceContaining_Test.java index 09b51eac92..4fd33ef865 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasStackTraceContaining_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasStackTraceContaining_Test.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.fail; import static org.assertj.core.error.ShouldContainCharSequence.shouldContain; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasSuppressedException_Test.java b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasSuppressedException_Test.java index ead49adebd..9e26a72fd3 100644 --- a/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasSuppressedException_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/internal/throwables/Throwables_assertHasSuppressedException_Test.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatNullPointerException; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.error.ShouldHaveSuppressedException.shouldHaveSuppressedException; -import static org.assertj.core.test.TestData.someInfo; +import static org.assertj.core.testkit.TestData.someInfo; import static org.assertj.core.util.FailureMessages.actualIsNull; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/matcher/AssertionMatcher_matches_Test.java b/assertj-core/src/test/java/org/assertj/core/matcher/AssertionMatcher_matches_Test.java index 05c7b0c421..92ecf8df84 100644 --- a/assertj-core/src/test/java/org/assertj/core/matcher/AssertionMatcher_matches_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/matcher/AssertionMatcher_matches_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/assertj-core/src/test/java/org/assertj/core/navigation/BaseNavigableIterableAssert_Test.java b/assertj-core/src/test/java/org/assertj/core/navigation/BaseNavigableIterableAssert_Test.java index 3cefb23178..29d4874b9e 100644 --- a/assertj-core/src/test/java/org/assertj/core/navigation/BaseNavigableIterableAssert_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/navigation/BaseNavigableIterableAssert_Test.java @@ -13,10 +13,10 @@ package org.assertj.core.navigation; import org.assertj.core.api.AbstractIterableAssert; -import org.assertj.core.test.Vehicle; -import org.assertj.core.test.VehicleAssert; +import org.assertj.core.testkit.Vehicle; +import org.assertj.core.testkit.VehicleAssert; public abstract class BaseNavigableIterableAssert_Test extends GenericNavigableAssert_Test, AbstractIterableAssert, Vehicle, VehicleAssert>> { -} \ No newline at end of file +} diff --git a/assertj-core/src/test/java/org/assertj/core/navigation/BaseNavigableListAssert_Test.java b/assertj-core/src/test/java/org/assertj/core/navigation/BaseNavigableListAssert_Test.java index c15679e8f9..a817cc1a17 100644 --- a/assertj-core/src/test/java/org/assertj/core/navigation/BaseNavigableListAssert_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/navigation/BaseNavigableListAssert_Test.java @@ -17,8 +17,8 @@ import java.util.List; import org.assertj.core.api.AbstractListAssert; -import org.assertj.core.test.Vehicle; -import org.assertj.core.test.VehicleAssert; +import org.assertj.core.testkit.Vehicle; +import org.assertj.core.testkit.VehicleAssert; import org.junit.jupiter.api.Test; abstract class BaseNavigableListAssert_Test diff --git a/assertj-core/src/test/java/org/assertj/core/navigation/ClassBasedNavigableIterable_Test.java b/assertj-core/src/test/java/org/assertj/core/navigation/ClassBasedNavigableIterable_Test.java index 2e7c31a80a..4b20e28dfc 100644 --- a/assertj-core/src/test/java/org/assertj/core/navigation/ClassBasedNavigableIterable_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/navigation/ClassBasedNavigableIterable_Test.java @@ -16,10 +16,10 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import org.assertj.core.api.ClassBasedNavigableIterableAssert; -import org.assertj.core.test.IllegalVehicleAssert; -import org.assertj.core.test.Vehicle; -import org.assertj.core.test.VehicleAssert; -import org.assertj.core.test.VehicleFactory; +import org.assertj.core.testkit.IllegalVehicleAssert; +import org.assertj.core.testkit.Vehicle; +import org.assertj.core.testkit.VehicleAssert; +import org.assertj.core.testkit.VehicleFactory; import org.junit.jupiter.api.Test; class ClassBasedNavigableIterable_Test extends BaseNavigableIterableAssert_Test { @@ -35,7 +35,7 @@ void do_not_swallow_reflection_problem() { IllegalVehicleAssert.class) .toAssert(new VehicleFactory.Car("car"), "unused")) - .withMessageContaining("not access a member of class org.assertj.core.test.IllegalVehicleAssert"); + .withMessageContaining("not access a member of class org.assertj.core.testkit.IllegalVehicleAssert"); } } diff --git a/assertj-core/src/test/java/org/assertj/core/navigation/ClassBasedNavigableList_Test.java b/assertj-core/src/test/java/org/assertj/core/navigation/ClassBasedNavigableList_Test.java index f216ff8f7f..dfaf786440 100644 --- a/assertj-core/src/test/java/org/assertj/core/navigation/ClassBasedNavigableList_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/navigation/ClassBasedNavigableList_Test.java @@ -18,10 +18,10 @@ import java.util.List; import org.assertj.core.api.ClassBasedNavigableListAssert; -import org.assertj.core.test.IllegalVehicleAssert; -import org.assertj.core.test.Vehicle; -import org.assertj.core.test.VehicleAssert; -import org.assertj.core.test.VehicleFactory; +import org.assertj.core.testkit.IllegalVehicleAssert; +import org.assertj.core.testkit.Vehicle; +import org.assertj.core.testkit.VehicleAssert; +import org.assertj.core.testkit.VehicleFactory; import org.junit.jupiter.api.Test; class ClassBasedNavigableList_Test extends BaseNavigableListAssert_Test { @@ -37,7 +37,7 @@ void do_not_swallow_reflection_problem() { IllegalVehicleAssert.class) .toAssert(new VehicleFactory.Car("car"), "unused")) - .withMessageContaining("not access a member of class org.assertj.core.test.IllegalVehicleAssert"); + .withMessageContaining("not access a member of class org.assertj.core.testkit.IllegalVehicleAssert"); } } diff --git a/assertj-core/src/test/java/org/assertj/core/navigation/FactoryBasedNavigableIterableAssert_Test.java b/assertj-core/src/test/java/org/assertj/core/navigation/FactoryBasedNavigableIterableAssert_Test.java index 9a9336b98b..c5d6421bde 100644 --- a/assertj-core/src/test/java/org/assertj/core/navigation/FactoryBasedNavigableIterableAssert_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/navigation/FactoryBasedNavigableIterableAssert_Test.java @@ -16,8 +16,8 @@ import org.assertj.core.api.AssertFactory; import org.assertj.core.api.FactoryBasedNavigableIterableAssert; -import org.assertj.core.test.Vehicle; -import org.assertj.core.test.VehicleAssert; +import org.assertj.core.testkit.Vehicle; +import org.assertj.core.testkit.VehicleAssert; class FactoryBasedNavigableIterableAssert_Test extends BaseNavigableIterableAssert_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/navigation/FactoryBasedNavigableListAssert_Test.java b/assertj-core/src/test/java/org/assertj/core/navigation/FactoryBasedNavigableListAssert_Test.java index a6345f3d4c..f3b10f7c78 100644 --- a/assertj-core/src/test/java/org/assertj/core/navigation/FactoryBasedNavigableListAssert_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/navigation/FactoryBasedNavigableListAssert_Test.java @@ -18,8 +18,8 @@ import org.assertj.core.api.AssertFactory; import org.assertj.core.api.FactoryBasedNavigableListAssert; -import org.assertj.core.test.Vehicle; -import org.assertj.core.test.VehicleAssert; +import org.assertj.core.testkit.Vehicle; +import org.assertj.core.testkit.VehicleAssert; class FactoryBasedNavigableListAssert_Test extends BaseNavigableListAssert_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/navigation/GenericNavigableAssert_Test.java b/assertj-core/src/test/java/org/assertj/core/navigation/GenericNavigableAssert_Test.java index b654acf463..e285ad7f65 100644 --- a/assertj-core/src/test/java/org/assertj/core/navigation/GenericNavigableAssert_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/navigation/GenericNavigableAssert_Test.java @@ -15,10 +15,10 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import org.assertj.core.api.AbstractIterableAssert; -import org.assertj.core.test.Vehicle; -import org.assertj.core.test.VehicleAssert; -import org.assertj.core.test.VehicleFactory; -import org.assertj.core.test.VehicleFactory.Car; +import org.assertj.core.testkit.Vehicle; +import org.assertj.core.testkit.VehicleAssert; +import org.assertj.core.testkit.VehicleFactory; +import org.assertj.core.testkit.VehicleFactory.Car; import org.assertj.core.util.Streams; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/presentation/StandardRepresentation_throwable_format_Test.java b/assertj-core/src/test/java/org/assertj/core/presentation/StandardRepresentation_throwable_format_Test.java index 26e43c833b..14228cb986 100644 --- a/assertj-core/src/test/java/org/assertj/core/presentation/StandardRepresentation_throwable_format_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/presentation/StandardRepresentation_throwable_format_Test.java @@ -15,12 +15,11 @@ 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.configuration.Configuration.DEFAULT_CONFIGURATION; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import org.assertj.core.configuration.Configuration; -import org.assertj.core.test.MutatesGlobalConfiguration; +import org.assertj.core.testkit.MutatesGlobalConfiguration; import org.junit.jupiter.api.Test; /** diff --git a/assertj-core/src/test/java/org/assertj/core/test/AlwaysDifferentComparator.java b/assertj-core/src/test/java/org/assertj/core/testkit/AlwaysDifferentComparator.java similarity index 97% rename from assertj-core/src/test/java/org/assertj/core/test/AlwaysDifferentComparator.java rename to assertj-core/src/test/java/org/assertj/core/testkit/AlwaysDifferentComparator.java index 656757b8cc..ce60a50d7e 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/AlwaysDifferentComparator.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/AlwaysDifferentComparator.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import java.sql.Timestamp; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/test/AlwaysEqualComparator.java b/assertj-core/src/test/java/org/assertj/core/testkit/AlwaysEqualComparator.java similarity index 97% rename from assertj-core/src/test/java/org/assertj/core/test/AlwaysEqualComparator.java rename to assertj-core/src/test/java/org/assertj/core/testkit/AlwaysEqualComparator.java index b90fcd09b5..f7153aa885 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/AlwaysEqualComparator.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/AlwaysEqualComparator.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import java.sql.Timestamp; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/test/Animal.java b/assertj-core/src/test/java/org/assertj/core/testkit/Animal.java similarity index 96% rename from assertj-core/src/test/java/org/assertj/core/test/Animal.java rename to assertj-core/src/test/java/org/assertj/core/testkit/Animal.java index 2a006c9471..677b611390 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/Animal.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/Animal.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; public class Animal { diff --git a/assertj-core/src/test/java/org/assertj/core/test/AssertionErrorExpectedException.java b/assertj-core/src/test/java/org/assertj/core/testkit/AssertionErrorExpectedException.java similarity index 95% rename from assertj-core/src/test/java/org/assertj/core/test/AssertionErrorExpectedException.java rename to assertj-core/src/test/java/org/assertj/core/testkit/AssertionErrorExpectedException.java index 91f2008903..fc30bbacfb 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/AssertionErrorExpectedException.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/AssertionErrorExpectedException.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; @SuppressWarnings("serial") public final class AssertionErrorExpectedException extends RuntimeException { diff --git a/assertj-core/src/test/java/org/assertj/core/test/BiPredicates.java b/assertj-core/src/test/java/org/assertj/core/testkit/BiPredicates.java similarity index 96% rename from assertj-core/src/test/java/org/assertj/core/test/BiPredicates.java rename to assertj-core/src/test/java/org/assertj/core/testkit/BiPredicates.java index 1aa99a693f..9668d0313e 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/BiPredicates.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/BiPredicates.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import java.util.function.BiPredicate; diff --git a/assertj-core/src/test/java/org/assertj/core/test/BooleanArrays.java b/assertj-core/src/test/java/org/assertj/core/testkit/BooleanArrays.java similarity index 96% rename from assertj-core/src/test/java/org/assertj/core/test/BooleanArrays.java rename to assertj-core/src/test/java/org/assertj/core/testkit/BooleanArrays.java index 16bfa51017..e40ad2e6c4 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/BooleanArrays.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/BooleanArrays.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; /** * @author Alex Ruiz diff --git a/assertj-core/src/test/java/org/assertj/core/test/ByteArrays.java b/assertj-core/src/test/java/org/assertj/core/testkit/ByteArrays.java similarity index 96% rename from assertj-core/src/test/java/org/assertj/core/test/ByteArrays.java rename to assertj-core/src/test/java/org/assertj/core/testkit/ByteArrays.java index b19172f5f6..f0b6269a8b 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/ByteArrays.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/ByteArrays.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; /** * @author Alex Ruiz diff --git a/assertj-core/src/test/java/org/assertj/core/test/CartoonCharacter.java b/assertj-core/src/test/java/org/assertj/core/testkit/CartoonCharacter.java similarity index 97% rename from assertj-core/src/test/java/org/assertj/core/test/CartoonCharacter.java rename to assertj-core/src/test/java/org/assertj/core/testkit/CartoonCharacter.java index 3348617515..e5022baca0 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/CartoonCharacter.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/CartoonCharacter.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import static java.util.Arrays.asList; diff --git a/assertj-core/src/test/java/org/assertj/core/test/CaseInsensitiveCharSequenceComparator.java b/assertj-core/src/test/java/org/assertj/core/testkit/CaseInsensitiveCharSequenceComparator.java similarity index 96% rename from assertj-core/src/test/java/org/assertj/core/test/CaseInsensitiveCharSequenceComparator.java rename to assertj-core/src/test/java/org/assertj/core/testkit/CaseInsensitiveCharSequenceComparator.java index 5fa772bbe8..74dd0c675b 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/CaseInsensitiveCharSequenceComparator.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/CaseInsensitiveCharSequenceComparator.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/test/CaseInsensitiveCharacterComparator.java b/assertj-core/src/test/java/org/assertj/core/testkit/CaseInsensitiveCharacterComparator.java similarity index 96% rename from assertj-core/src/test/java/org/assertj/core/test/CaseInsensitiveCharacterComparator.java rename to assertj-core/src/test/java/org/assertj/core/testkit/CaseInsensitiveCharacterComparator.java index f2716e82fe..d699cca77c 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/CaseInsensitiveCharacterComparator.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/CaseInsensitiveCharacterComparator.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import static java.lang.Character.toLowerCase; diff --git a/assertj-core/src/test/java/org/assertj/core/test/CaseInsensitiveCharacterComparatorTest.java b/assertj-core/src/test/java/org/assertj/core/testkit/CaseInsensitiveCharacterComparatorTest.java similarity index 96% rename from assertj-core/src/test/java/org/assertj/core/test/CaseInsensitiveCharacterComparatorTest.java rename to assertj-core/src/test/java/org/assertj/core/testkit/CaseInsensitiveCharacterComparatorTest.java index ac5fd506d2..48464b02de 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/CaseInsensitiveCharacterComparatorTest.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/CaseInsensitiveCharacterComparatorTest.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import static org.assertj.core.api.BDDAssertions.then; diff --git a/assertj-core/src/test/java/org/assertj/core/test/CaseInsensitiveStringComparator.java b/assertj-core/src/test/java/org/assertj/core/testkit/CaseInsensitiveStringComparator.java similarity index 96% rename from assertj-core/src/test/java/org/assertj/core/test/CaseInsensitiveStringComparator.java rename to assertj-core/src/test/java/org/assertj/core/testkit/CaseInsensitiveStringComparator.java index fdf104dc4e..194a128507 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/CaseInsensitiveStringComparator.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/CaseInsensitiveStringComparator.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/test/CaseInsensitiveStringComparatorTest.java b/assertj-core/src/test/java/org/assertj/core/testkit/CaseInsensitiveStringComparatorTest.java similarity index 96% rename from assertj-core/src/test/java/org/assertj/core/test/CaseInsensitiveStringComparatorTest.java rename to assertj-core/src/test/java/org/assertj/core/testkit/CaseInsensitiveStringComparatorTest.java index 35ea8d99e3..d3c6379b79 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/CaseInsensitiveStringComparatorTest.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/CaseInsensitiveStringComparatorTest.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import static org.assertj.core.api.BDDAssertions.then; diff --git a/assertj-core/src/test/java/org/assertj/core/test/CharArrays.java b/assertj-core/src/test/java/org/assertj/core/testkit/CharArrays.java similarity index 96% rename from assertj-core/src/test/java/org/assertj/core/test/CharArrays.java rename to assertj-core/src/test/java/org/assertj/core/testkit/CharArrays.java index d2eaaaca93..027e5c9251 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/CharArrays.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/CharArrays.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; /** * @author Alex Ruiz diff --git a/assertj-core/src/test/java/org/assertj/core/test/ConfigurationForTests.java b/assertj-core/src/test/java/org/assertj/core/testkit/ConfigurationForTests.java similarity index 96% rename from assertj-core/src/test/java/org/assertj/core/test/ConfigurationForTests.java rename to assertj-core/src/test/java/org/assertj/core/testkit/ConfigurationForTests.java index 83a1ec79e4..8d0340da57 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/ConfigurationForTests.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/ConfigurationForTests.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import org.assertj.core.configuration.Configuration; diff --git a/assertj-core/src/test/java/org/assertj/core/test/DoubleArrays.java b/assertj-core/src/test/java/org/assertj/core/testkit/DoubleArrays.java similarity index 96% rename from assertj-core/src/test/java/org/assertj/core/test/DoubleArrays.java rename to assertj-core/src/test/java/org/assertj/core/testkit/DoubleArrays.java index 312526d083..53532923a3 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/DoubleArrays.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/DoubleArrays.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; /** * @author Alex Ruiz diff --git a/assertj-core/src/test/java/org/assertj/core/test/Employee.java b/assertj-core/src/test/java/org/assertj/core/testkit/Employee.java similarity index 98% rename from assertj-core/src/test/java/org/assertj/core/test/Employee.java rename to assertj-core/src/test/java/org/assertj/core/testkit/Employee.java index f33f94a1f6..21ed5c4e28 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/Employee.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/Employee.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import static java.lang.String.format; diff --git a/assertj-core/src/test/java/org/assertj/core/test/EqualsHashCodeContractAssert.java b/assertj-core/src/test/java/org/assertj/core/testkit/EqualsHashCodeContractAssert.java similarity index 99% rename from assertj-core/src/test/java/org/assertj/core/test/EqualsHashCodeContractAssert.java rename to assertj-core/src/test/java/org/assertj/core/testkit/EqualsHashCodeContractAssert.java index 48c7478cf1..7007815969 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/EqualsHashCodeContractAssert.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/EqualsHashCodeContractAssert.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import static org.assertj.core.api.Assertions.assertThat; diff --git a/assertj-core/src/test/java/org/assertj/core/test/EqualsHashCodeContractTestCase.java b/assertj-core/src/test/java/org/assertj/core/testkit/EqualsHashCodeContractTestCase.java similarity index 98% rename from assertj-core/src/test/java/org/assertj/core/test/EqualsHashCodeContractTestCase.java rename to assertj-core/src/test/java/org/assertj/core/testkit/EqualsHashCodeContractTestCase.java index eb3b794665..7c8aa389d8 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/EqualsHashCodeContractTestCase.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/EqualsHashCodeContractTestCase.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; /** * Test case that provides the contract for verification that an object's {@code equals} and {@code hashCode} are diff --git a/assertj-core/src/test/java/org/assertj/core/test/ErrorMessagesForTest.java b/assertj-core/src/test/java/org/assertj/core/testkit/ErrorMessagesForTest.java similarity index 96% rename from assertj-core/src/test/java/org/assertj/core/test/ErrorMessagesForTest.java rename to assertj-core/src/test/java/org/assertj/core/testkit/ErrorMessagesForTest.java index ee10f0cb02..c58e3c4f07 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/ErrorMessagesForTest.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/ErrorMessagesForTest.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import static java.lang.String.format; diff --git a/assertj-core/src/test/java/org/assertj/core/test/FloatArrays.java b/assertj-core/src/test/java/org/assertj/core/testkit/FloatArrays.java similarity index 96% rename from assertj-core/src/test/java/org/assertj/core/test/FloatArrays.java rename to assertj-core/src/test/java/org/assertj/core/testkit/FloatArrays.java index 9cbb07492d..f197ba0d5b 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/FloatArrays.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/FloatArrays.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; /** * @author Alex Ruiz diff --git a/assertj-core/src/test/java/org/assertj/core/test/FluentJedi.java b/assertj-core/src/test/java/org/assertj/core/testkit/FluentJedi.java similarity index 97% rename from assertj-core/src/test/java/org/assertj/core/test/FluentJedi.java rename to assertj-core/src/test/java/org/assertj/core/testkit/FluentJedi.java index aa3e258890..8e0d4ad6ec 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/FluentJedi.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/FluentJedi.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import org.assertj.core.api.AbstractIterableAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/test/IllegalVehicleAssert.java b/assertj-core/src/test/java/org/assertj/core/testkit/IllegalVehicleAssert.java similarity index 96% rename from assertj-core/src/test/java/org/assertj/core/test/IllegalVehicleAssert.java rename to assertj-core/src/test/java/org/assertj/core/testkit/IllegalVehicleAssert.java index 7a0dcb4ec8..d37513e7da 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/IllegalVehicleAssert.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/IllegalVehicleAssert.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import org.assertj.core.api.AbstractAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/test/IntArrays.java b/assertj-core/src/test/java/org/assertj/core/testkit/IntArrays.java similarity index 96% rename from assertj-core/src/test/java/org/assertj/core/test/IntArrays.java rename to assertj-core/src/test/java/org/assertj/core/testkit/IntArrays.java index f6deab4f58..4f1d17346f 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/IntArrays.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/IntArrays.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; /** * @author Alex Ruiz diff --git a/assertj-core/src/test/java/org/assertj/core/test/Jedi.java b/assertj-core/src/test/java/org/assertj/core/testkit/Jedi.java similarity index 98% rename from assertj-core/src/test/java/org/assertj/core/test/Jedi.java rename to assertj-core/src/test/java/org/assertj/core/testkit/Jedi.java index e27ab3dd58..018d6c7adb 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/Jedi.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/Jedi.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import java.util.Random; diff --git a/assertj-core/src/test/java/org/assertj/core/test/LongArrays.java b/assertj-core/src/test/java/org/assertj/core/testkit/LongArrays.java similarity index 96% rename from assertj-core/src/test/java/org/assertj/core/test/LongArrays.java rename to assertj-core/src/test/java/org/assertj/core/testkit/LongArrays.java index 693f68a14d..c776ae86dd 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/LongArrays.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/LongArrays.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; /** * @author Alex Ruiz diff --git a/assertj-core/src/test/java/org/assertj/core/test/Maps.java b/assertj-core/src/test/java/org/assertj/core/testkit/Maps.java similarity index 97% rename from assertj-core/src/test/java/org/assertj/core/test/Maps.java rename to assertj-core/src/test/java/org/assertj/core/testkit/Maps.java index 86f8da020e..bb4c856e5c 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/Maps.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/Maps.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import java.util.LinkedHashMap; import java.util.Map; diff --git a/assertj-core/src/test/java/org/assertj/core/test/MutatesGlobalConfiguration.java b/assertj-core/src/test/java/org/assertj/core/testkit/MutatesGlobalConfiguration.java similarity index 93% rename from assertj-core/src/test/java/org/assertj/core/test/MutatesGlobalConfiguration.java rename to assertj-core/src/test/java/org/assertj/core/testkit/MutatesGlobalConfiguration.java index afe377afff..a0e6bf2d2c 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/MutatesGlobalConfiguration.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/MutatesGlobalConfiguration.java @@ -10,12 +10,12 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import java.lang.annotation.ElementType; import java.lang.annotation.Target; import org.assertj.core.configuration.ConfigurationProvider; -import org.assertj.core.test.MutatesGlobalConfiguration.AssumptionMutatingExtension; +import org.assertj.core.testkit.MutatesGlobalConfiguration.AssumptionMutatingExtension; import org.junit.jupiter.api.extension.AfterAllCallback; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/assertj-core/src/test/java/org/assertj/core/test/Name.java b/assertj-core/src/test/java/org/assertj/core/testkit/Name.java similarity index 98% rename from assertj-core/src/test/java/org/assertj/core/test/Name.java rename to assertj-core/src/test/java/org/assertj/core/testkit/Name.java index 960e1b5788..b340a5cd64 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/Name.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/Name.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import static java.util.Comparator.comparing; diff --git a/assertj-core/src/test/java/org/assertj/core/test/NeverEqualComparator.java b/assertj-core/src/test/java/org/assertj/core/testkit/NeverEqualComparator.java similarity index 97% rename from assertj-core/src/test/java/org/assertj/core/test/NeverEqualComparator.java rename to assertj-core/src/test/java/org/assertj/core/testkit/NeverEqualComparator.java index 3756131bf9..90f300b543 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/NeverEqualComparator.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/NeverEqualComparator.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import org.assertj.core.internal.DescribableComparator; diff --git a/assertj-core/src/test/java/org/assertj/core/test/ObjectArrays.java b/assertj-core/src/test/java/org/assertj/core/testkit/ObjectArrays.java similarity index 96% rename from assertj-core/src/test/java/org/assertj/core/test/ObjectArrays.java rename to assertj-core/src/test/java/org/assertj/core/testkit/ObjectArrays.java index 07320d589b..bacd2c4008 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/ObjectArrays.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/ObjectArrays.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import java.util.List; diff --git a/assertj-core/src/test/java/org/assertj/core/test/Patient.java b/assertj-core/src/test/java/org/assertj/core/testkit/Patient.java similarity index 98% rename from assertj-core/src/test/java/org/assertj/core/test/Patient.java rename to assertj-core/src/test/java/org/assertj/core/testkit/Patient.java index 9655579b80..e03d3389a8 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/Patient.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/Patient.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import java.sql.Timestamp; import java.util.Objects; diff --git a/assertj-core/src/test/java/org/assertj/core/test/Person.java b/assertj-core/src/test/java/org/assertj/core/testkit/Person.java similarity index 97% rename from assertj-core/src/test/java/org/assertj/core/test/Person.java rename to assertj-core/src/test/java/org/assertj/core/testkit/Person.java index 94560fda3d..9bcfcf88a0 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/Person.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/Person.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import java.util.Objects; diff --git a/assertj-core/src/test/java/org/assertj/core/test/PersonCaseInsensitiveNameComparator.java b/assertj-core/src/test/java/org/assertj/core/testkit/PersonCaseInsensitiveNameComparator.java similarity index 96% rename from assertj-core/src/test/java/org/assertj/core/test/PersonCaseInsensitiveNameComparator.java rename to assertj-core/src/test/java/org/assertj/core/testkit/PersonCaseInsensitiveNameComparator.java index 1d6734bb08..13e64c4577 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/PersonCaseInsensitiveNameComparator.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/PersonCaseInsensitiveNameComparator.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import java.util.Comparator; diff --git a/assertj-core/src/test/java/org/assertj/core/test/Player.java b/assertj-core/src/test/java/org/assertj/core/testkit/Player.java similarity index 98% rename from assertj-core/src/test/java/org/assertj/core/test/Player.java rename to assertj-core/src/test/java/org/assertj/core/testkit/Player.java index 1c8336ecfa..f94a997ef0 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/Player.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/Player.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import static java.lang.String.format; diff --git a/assertj-core/src/test/java/org/assertj/core/test/PotentialMvpCondition.java b/assertj-core/src/test/java/org/assertj/core/testkit/PotentialMvpCondition.java similarity index 96% rename from assertj-core/src/test/java/org/assertj/core/test/PotentialMvpCondition.java rename to assertj-core/src/test/java/org/assertj/core/testkit/PotentialMvpCondition.java index 4e53aa0f32..c84e8b754a 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/PotentialMvpCondition.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/PotentialMvpCondition.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import org.assertj.core.api.Condition; diff --git a/assertj-core/src/test/java/org/assertj/core/test/ShortArrays.java b/assertj-core/src/test/java/org/assertj/core/testkit/ShortArrays.java similarity index 96% rename from assertj-core/src/test/java/org/assertj/core/test/ShortArrays.java rename to assertj-core/src/test/java/org/assertj/core/testkit/ShortArrays.java index 6db1b7c586..297466762d 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/ShortArrays.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/ShortArrays.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; /** * @author Alex Ruiz diff --git a/assertj-core/src/test/java/org/assertj/core/test/StringSpliterator.java b/assertj-core/src/test/java/org/assertj/core/testkit/StringSpliterator.java similarity index 97% rename from assertj-core/src/test/java/org/assertj/core/test/StringSpliterator.java rename to assertj-core/src/test/java/org/assertj/core/testkit/StringSpliterator.java index 74e04afee9..5dffb9996b 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/StringSpliterator.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/StringSpliterator.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import java.util.Spliterator; import java.util.function.Consumer; diff --git a/assertj-core/src/test/java/org/assertj/core/test/StringStream.java b/assertj-core/src/test/java/org/assertj/core/testkit/StringStream.java similarity index 99% rename from assertj-core/src/test/java/org/assertj/core/test/StringStream.java rename to assertj-core/src/test/java/org/assertj/core/testkit/StringStream.java index 9db9986f43..3a0cdc441e 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/StringStream.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/StringStream.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import java.util.Comparator; import java.util.Iterator; @@ -229,4 +229,4 @@ public Optional findFirst() { public Optional findAny() { return null; } -} \ No newline at end of file +} diff --git a/assertj-core/src/test/java/org/assertj/core/test/TestClassWithRandomId.java b/assertj-core/src/test/java/org/assertj/core/testkit/TestClassWithRandomId.java similarity index 97% rename from assertj-core/src/test/java/org/assertj/core/test/TestClassWithRandomId.java rename to assertj-core/src/test/java/org/assertj/core/testkit/TestClassWithRandomId.java index 713f456833..42b22cc164 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/TestClassWithRandomId.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/TestClassWithRandomId.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; /** * Object for test with a private inaccessible field set a unique value. diff --git a/assertj-core/src/test/java/org/assertj/core/test/TestData.java b/assertj-core/src/test/java/org/assertj/core/testkit/TestData.java similarity index 98% rename from assertj-core/src/test/java/org/assertj/core/test/TestData.java rename to assertj-core/src/test/java/org/assertj/core/testkit/TestData.java index f1e98b79e2..dd48a865a8 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/TestData.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/TestData.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import static org.assertj.core.data.Index.atIndex; diff --git a/assertj-core/src/test/java/org/assertj/core/test/ThrowingCallableFactory.java b/assertj-core/src/test/java/org/assertj/core/testkit/ThrowingCallableFactory.java similarity index 96% rename from assertj-core/src/test/java/org/assertj/core/test/ThrowingCallableFactory.java rename to assertj-core/src/test/java/org/assertj/core/testkit/ThrowingCallableFactory.java index 72cde3fd1d..e543986076 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/ThrowingCallableFactory.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/ThrowingCallableFactory.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import org.assertj.core.api.ThrowableAssert.ThrowingCallable; diff --git a/assertj-core/src/test/java/org/assertj/core/test/TypeCanonizer.java b/assertj-core/src/test/java/org/assertj/core/testkit/TypeCanonizer.java similarity index 99% rename from assertj-core/src/test/java/org/assertj/core/test/TypeCanonizer.java rename to assertj-core/src/test/java/org/assertj/core/testkit/TypeCanonizer.java index 5b1bd0929b..55e44f6b82 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/TypeCanonizer.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/TypeCanonizer.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import java.io.InputStream; import java.lang.reflect.GenericArrayType; diff --git a/assertj-core/src/test/java/org/assertj/core/test/TypeCanonizerTest.java b/assertj-core/src/test/java/org/assertj/core/testkit/TypeCanonizerTest.java similarity index 99% rename from assertj-core/src/test/java/org/assertj/core/test/TypeCanonizerTest.java rename to assertj-core/src/test/java/org/assertj/core/testkit/TypeCanonizerTest.java index 73e396f051..d889a1b582 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/TypeCanonizerTest.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/TypeCanonizerTest.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import static org.assertj.core.api.Assertions.assertThat; diff --git a/assertj-core/src/test/java/org/assertj/core/test/Vehicle.java b/assertj-core/src/test/java/org/assertj/core/testkit/Vehicle.java similarity index 95% rename from assertj-core/src/test/java/org/assertj/core/test/Vehicle.java rename to assertj-core/src/test/java/org/assertj/core/testkit/Vehicle.java index 3d142daeba..0c2af40a4c 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/Vehicle.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/Vehicle.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; /** * @author Marcus Klimstra (CGI) diff --git a/assertj-core/src/test/java/org/assertj/core/test/VehicleAssert.java b/assertj-core/src/test/java/org/assertj/core/testkit/VehicleAssert.java similarity index 97% rename from assertj-core/src/test/java/org/assertj/core/test/VehicleAssert.java rename to assertj-core/src/test/java/org/assertj/core/testkit/VehicleAssert.java index 948e8e1ca9..87c9b4ef81 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/VehicleAssert.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/VehicleAssert.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import org.assertj.core.api.AbstractAssert; diff --git a/assertj-core/src/test/java/org/assertj/core/test/VehicleFactory.java b/assertj-core/src/test/java/org/assertj/core/testkit/VehicleFactory.java similarity index 97% rename from assertj-core/src/test/java/org/assertj/core/test/VehicleFactory.java rename to assertj-core/src/test/java/org/assertj/core/testkit/VehicleFactory.java index b27fbab162..717f59efc0 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/VehicleFactory.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/VehicleFactory.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import java.util.Arrays; import java.util.List; diff --git a/assertj-core/src/test/java/org/assertj/core/test/WithPlayerData.java b/assertj-core/src/test/java/org/assertj/core/testkit/WithPlayerData.java similarity index 98% rename from assertj-core/src/test/java/org/assertj/core/test/WithPlayerData.java rename to assertj-core/src/test/java/org/assertj/core/testkit/WithPlayerData.java index 435d7290fc..607bb08871 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/WithPlayerData.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/WithPlayerData.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test; +package org.assertj.core.testkit; import static org.assertj.core.util.Lists.newArrayList; diff --git a/assertj-core/src/test/java/org/assertj/core/test/jdk11/ImmutableCollections.java b/assertj-core/src/test/java/org/assertj/core/testkit/jdk11/ImmutableCollections.java similarity index 99% rename from assertj-core/src/test/java/org/assertj/core/test/jdk11/ImmutableCollections.java rename to assertj-core/src/test/java/org/assertj/core/testkit/jdk11/ImmutableCollections.java index a5da9d42f7..82d27e52d9 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/jdk11/ImmutableCollections.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/jdk11/ImmutableCollections.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test.jdk11; +package org.assertj.core.testkit.jdk11; import java.io.IOException; import java.io.InvalidObjectException; diff --git a/assertj-core/src/test/java/org/assertj/core/test/jdk11/Jdk11.java b/assertj-core/src/test/java/org/assertj/core/testkit/jdk11/Jdk11.java similarity index 99% rename from assertj-core/src/test/java/org/assertj/core/test/jdk11/Jdk11.java rename to assertj-core/src/test/java/org/assertj/core/testkit/jdk11/Jdk11.java index 6325fc48a7..f198bb5360 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/jdk11/Jdk11.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/jdk11/Jdk11.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test.jdk11; +package org.assertj.core.testkit.jdk11; import java.util.AbstractMap; import java.util.Collection; diff --git a/assertj-core/src/test/java/org/assertj/core/test/jdk11/KeyValueHolder.java b/assertj-core/src/test/java/org/assertj/core/testkit/jdk11/KeyValueHolder.java similarity index 98% rename from assertj-core/src/test/java/org/assertj/core/test/jdk11/KeyValueHolder.java rename to assertj-core/src/test/java/org/assertj/core/testkit/jdk11/KeyValueHolder.java index 7a122e59cc..0480504dce 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/jdk11/KeyValueHolder.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/jdk11/KeyValueHolder.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test.jdk11; +package org.assertj.core.testkit.jdk11; import java.util.Map; import java.util.Objects; diff --git a/assertj-core/src/test/java/org/assertj/core/test/jdk11/package-info.java b/assertj-core/src/test/java/org/assertj/core/testkit/jdk11/package-info.java similarity index 83% rename from assertj-core/src/test/java/org/assertj/core/test/jdk11/package-info.java rename to assertj-core/src/test/java/org/assertj/core/testkit/jdk11/package-info.java index 88df4e9308..c341484210 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/jdk11/package-info.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/jdk11/package-info.java @@ -12,6 +12,6 @@ */ /** * Cherry-picked implementations taken from the JDK 11. - * The {@link org.assertj.core.test.jdk11.Jdk11} class should be used as entry point. + * The {@link org.assertj.core.testkit.jdk11.Jdk11} class should be used as entry point. */ -package org.assertj.core.test.jdk11; +package org.assertj.core.testkit.jdk11; diff --git a/assertj-core/src/test/java/org/assertj/core/test/junit/jupiter/DefaultDisplayNameGenerator.java b/assertj-core/src/test/java/org/assertj/core/testkit/junit/jupiter/DefaultDisplayNameGenerator.java similarity index 96% rename from assertj-core/src/test/java/org/assertj/core/test/junit/jupiter/DefaultDisplayNameGenerator.java rename to assertj-core/src/test/java/org/assertj/core/testkit/junit/jupiter/DefaultDisplayNameGenerator.java index 01707f7ae6..d16ab57182 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/junit/jupiter/DefaultDisplayNameGenerator.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/junit/jupiter/DefaultDisplayNameGenerator.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test.junit.jupiter; +package org.assertj.core.testkit.junit.jupiter; import org.junit.jupiter.api.DisplayNameGenerator; diff --git a/assertj-core/src/test/java/org/assertj/core/test/junit/jupiter/DefaultDisplayNameGeneratorTest.java b/assertj-core/src/test/java/org/assertj/core/testkit/junit/jupiter/DefaultDisplayNameGeneratorTest.java similarity index 83% rename from assertj-core/src/test/java/org/assertj/core/test/junit/jupiter/DefaultDisplayNameGeneratorTest.java rename to assertj-core/src/test/java/org/assertj/core/testkit/junit/jupiter/DefaultDisplayNameGeneratorTest.java index 42670a8190..51186e3b02 100644 --- a/assertj-core/src/test/java/org/assertj/core/test/junit/jupiter/DefaultDisplayNameGeneratorTest.java +++ b/assertj-core/src/test/java/org/assertj/core/testkit/junit/jupiter/DefaultDisplayNameGeneratorTest.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.test.junit.jupiter; +package org.assertj.core.testkit.junit.jupiter; import static org.assertj.core.api.BDDAssertions.then; @@ -23,8 +23,8 @@ class DefaultDisplayNameGeneratorTest { @ParameterizedTest @CsvSource({ - "org.assertj.core.test.junit.jupiter.SomeAssert_someMethod_Test, SomeAssert someMethod", - "org.assertj.core.test.junit.jupiter.SomeAssert_someMethod_with_SomeType_Test, SomeAssert someMethod with SomeType" + "org.assertj.core.testkit.junit.jupiter.SomeAssert_someMethod_Test, SomeAssert someMethod", + "org.assertj.core.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-core/src/test/java/org/assertj/core/util/diff/ChunkTest.java b/assertj-core/src/test/java/org/assertj/core/util/diff/ChunkTest.java index 79d946c405..e1adecc5db 100644 --- a/assertj-core/src/test/java/org/assertj/core/util/diff/ChunkTest.java +++ b/assertj-core/src/test/java/org/assertj/core/util/diff/ChunkTest.java @@ -14,10 +14,10 @@ import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.EqualsHashCodeContractAssert.assertEqualsIsReflexive; -import static org.assertj.core.test.EqualsHashCodeContractAssert.assertEqualsIsSymmetric; -import static org.assertj.core.test.EqualsHashCodeContractAssert.assertEqualsIsTransitive; -import static org.assertj.core.test.EqualsHashCodeContractAssert.assertMaintainsEqualsAndHashCodeContract; +import static org.assertj.core.testkit.EqualsHashCodeContractAssert.assertEqualsIsReflexive; +import static org.assertj.core.testkit.EqualsHashCodeContractAssert.assertEqualsIsSymmetric; +import static org.assertj.core.testkit.EqualsHashCodeContractAssert.assertEqualsIsTransitive; +import static org.assertj.core.testkit.EqualsHashCodeContractAssert.assertMaintainsEqualsAndHashCodeContract; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/util/diff/Delta_equals_hashCode_Test.java b/assertj-core/src/test/java/org/assertj/core/util/diff/Delta_equals_hashCode_Test.java index 8d8bfdc2ec..4def744f39 100644 --- a/assertj-core/src/test/java/org/assertj/core/util/diff/Delta_equals_hashCode_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/util/diff/Delta_equals_hashCode_Test.java @@ -13,10 +13,10 @@ package org.assertj.core.util.diff; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.test.EqualsHashCodeContractAssert.assertEqualsIsReflexive; -import static org.assertj.core.test.EqualsHashCodeContractAssert.assertEqualsIsSymmetric; -import static org.assertj.core.test.EqualsHashCodeContractAssert.assertEqualsIsTransitive; -import static org.assertj.core.test.EqualsHashCodeContractAssert.assertMaintainsEqualsAndHashCodeContract; +import static org.assertj.core.testkit.EqualsHashCodeContractAssert.assertEqualsIsReflexive; +import static org.assertj.core.testkit.EqualsHashCodeContractAssert.assertEqualsIsSymmetric; +import static org.assertj.core.testkit.EqualsHashCodeContractAssert.assertEqualsIsTransitive; +import static org.assertj.core.testkit.EqualsHashCodeContractAssert.assertMaintainsEqualsAndHashCodeContract; import java.util.Collections; diff --git a/assertj-core/src/test/java/org/assertj/core/util/introspection/FieldSupport_fieldValues_Test.java b/assertj-core/src/test/java/org/assertj/core/util/introspection/FieldSupport_fieldValues_Test.java index eaed79ae4e..f78e58df29 100644 --- a/assertj-core/src/test/java/org/assertj/core/util/introspection/FieldSupport_fieldValues_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/util/introspection/FieldSupport_fieldValues_Test.java @@ -20,8 +20,8 @@ import java.util.List; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/util/introspection/FieldSupport_isAllowedToReadField_Test.java b/assertj-core/src/test/java/org/assertj/core/util/introspection/FieldSupport_isAllowedToReadField_Test.java index 9d961fcd00..de65bb28fb 100644 --- a/assertj-core/src/test/java/org/assertj/core/util/introspection/FieldSupport_isAllowedToReadField_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/util/introspection/FieldSupport_isAllowedToReadField_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.assertj.core.test.Jedi; +import org.assertj.core.testkit.Jedi; import org.junit.jupiter.api.Test; class FieldSupport_isAllowedToReadField_Test { diff --git a/assertj-core/src/test/java/org/assertj/core/util/introspection/MethodSupport_methodResultFor_Test.java b/assertj-core/src/test/java/org/assertj/core/util/introspection/MethodSupport_methodResultFor_Test.java index e29c7aa147..6be34f6a6b 100644 --- a/assertj-core/src/test/java/org/assertj/core/util/introspection/MethodSupport_methodResultFor_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/util/introspection/MethodSupport_methodResultFor_Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.assertThatNullPointerException; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Person; import org.assertj.core.util.introspection.beans.SuperHero; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/util/introspection/PropertyOrFieldSupport_getValueOf_Test.java b/assertj-core/src/test/java/org/assertj/core/util/introspection/PropertyOrFieldSupport_getValueOf_Test.java index 3b32bbcfa4..d31f16caaa 100644 --- a/assertj-core/src/test/java/org/assertj/core/util/introspection/PropertyOrFieldSupport_getValueOf_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/util/introspection/PropertyOrFieldSupport_getValueOf_Test.java @@ -23,8 +23,8 @@ import java.util.List; import java.util.Map; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/util/introspection/PropertySupport_propertyValues_Test.java b/assertj-core/src/test/java/org/assertj/core/util/introspection/PropertySupport_propertyValues_Test.java index 5fac9bd40e..9361611b0b 100644 --- a/assertj-core/src/test/java/org/assertj/core/util/introspection/PropertySupport_propertyValues_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/util/introspection/PropertySupport_propertyValues_Test.java @@ -21,9 +21,9 @@ import java.util.Collection; import java.util.List; -import org.assertj.core.test.Employee; -import org.assertj.core.test.Name; -import org.assertj.core.test.VehicleFactory; +import org.assertj.core.testkit.Employee; +import org.assertj.core.testkit.Name; +import org.assertj.core.testkit.VehicleFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/util/introspection/PropertySupport_publicGetterExistsFor_Test.java b/assertj-core/src/test/java/org/assertj/core/util/introspection/PropertySupport_publicGetterExistsFor_Test.java index 3f59644ae7..fabbf0d1e9 100644 --- a/assertj-core/src/test/java/org/assertj/core/util/introspection/PropertySupport_publicGetterExistsFor_Test.java +++ b/assertj-core/src/test/java/org/assertj/core/util/introspection/PropertySupport_publicGetterExistsFor_Test.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Person; import org.assertj.core.util.introspection.beans.SuperHero; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/assertj-core/src/test/java/org/assertj/core/util/introspection/beans/SuperHero.java b/assertj-core/src/test/java/org/assertj/core/util/introspection/beans/SuperHero.java index 557ccc7c65..cecc668e6e 100644 --- a/assertj-core/src/test/java/org/assertj/core/util/introspection/beans/SuperHero.java +++ b/assertj-core/src/test/java/org/assertj/core/util/introspection/beans/SuperHero.java @@ -12,7 +12,7 @@ */ package org.assertj.core.util.introspection.beans; -import org.assertj.core.test.Person; +import org.assertj.core.testkit.Person; public class SuperHero extends Person { diff --git a/assertj-core/src/test/java/org/example/test/AssertJMultipleFailuresError_getMessage_Test.java b/assertj-core/src/test/java/org/example/test/AssertJMultipleFailuresError_getMessage_Test.java index 4a2159e584..defc913830 100644 --- a/assertj-core/src/test/java/org/example/test/AssertJMultipleFailuresError_getMessage_Test.java +++ b/assertj-core/src/test/java/org/example/test/AssertJMultipleFailuresError_getMessage_Test.java @@ -14,7 +14,7 @@ import static java.lang.String.format; import static org.assertj.core.api.BDDAssertions.then; -import static org.assertj.core.test.ErrorMessagesForTest.shouldBeEqualMessage; +import static org.assertj.core.testkit.ErrorMessagesForTest.shouldBeEqualMessage; import static org.assertj.core.util.AssertionsUtil.expectAssertionError; import static org.assertj.core.util.Lists.list; diff --git a/assertj-core/src/test/resources/META-INF/services/org.assertj.core.configuration.Configuration b/assertj-core/src/test/resources/META-INF/services/org.assertj.core.configuration.Configuration index 21881f3737..218bbc7e93 100644 --- a/assertj-core/src/test/resources/META-INF/services/org.assertj.core.configuration.Configuration +++ b/assertj-core/src/test/resources/META-INF/services/org.assertj.core.configuration.Configuration @@ -1 +1 @@ -org.assertj.core.test.ConfigurationForTests \ No newline at end of file +org.assertj.core.testkit.ConfigurationForTests diff --git a/assertj-core/src/test/resources/junit-platform.properties b/assertj-core/src/test/resources/junit-platform.properties index 4f656ee47a..d9755762f6 100644 --- a/assertj-core/src/test/resources/junit-platform.properties +++ b/assertj-core/src/test/resources/junit-platform.properties @@ -1 +1 @@ -junit.jupiter.displayname.generator.default=org.assertj.core.test.junit.jupiter.DefaultDisplayNameGenerator +junit.jupiter.displayname.generator.default=org.assertj.core.testkit.junit.jupiter.DefaultDisplayNameGenerator diff --git a/assertj-tests/assertj-integration-tests/assertj-core-groovy/src/test/groovy/org/assertj/core/tests/groovy/Assertions_assertThatCharSequence_with_Groovy_strings_Test.groovy b/assertj-tests/assertj-integration-tests/assertj-core-groovy/src/test/groovy/org/assertj/tests/core/groovy/Assertions_assertThatCharSequence_with_Groovy_strings_Test.groovy similarity index 96% rename from assertj-tests/assertj-integration-tests/assertj-core-groovy/src/test/groovy/org/assertj/core/tests/groovy/Assertions_assertThatCharSequence_with_Groovy_strings_Test.groovy rename to assertj-tests/assertj-integration-tests/assertj-core-groovy/src/test/groovy/org/assertj/tests/core/groovy/Assertions_assertThatCharSequence_with_Groovy_strings_Test.groovy index 2f1fee1aaa..e6fd8096bf 100644 --- a/assertj-tests/assertj-integration-tests/assertj-core-groovy/src/test/groovy/org/assertj/core/tests/groovy/Assertions_assertThatCharSequence_with_Groovy_strings_Test.groovy +++ b/assertj-tests/assertj-integration-tests/assertj-core-groovy/src/test/groovy/org/assertj/tests/core/groovy/Assertions_assertThatCharSequence_with_Groovy_strings_Test.groovy @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.tests.groovy +package org.assertj.tests.core.groovy import org.junit.jupiter.api.Test diff --git a/assertj-tests/assertj-integration-tests/assertj-core-groovy/src/test/groovy/org/assertj/core/tests/groovy/Assertions_assertThat_with_Groovy_strings_Test.groovy b/assertj-tests/assertj-integration-tests/assertj-core-groovy/src/test/groovy/org/assertj/tests/core/groovy/Assertions_assertThat_with_Groovy_strings_Test.groovy similarity index 97% rename from assertj-tests/assertj-integration-tests/assertj-core-groovy/src/test/groovy/org/assertj/core/tests/groovy/Assertions_assertThat_with_Groovy_strings_Test.groovy rename to assertj-tests/assertj-integration-tests/assertj-core-groovy/src/test/groovy/org/assertj/tests/core/groovy/Assertions_assertThat_with_Groovy_strings_Test.groovy index 1cd0136ce6..07ea11a972 100644 --- a/assertj-tests/assertj-integration-tests/assertj-core-groovy/src/test/groovy/org/assertj/core/tests/groovy/Assertions_assertThat_with_Groovy_strings_Test.groovy +++ b/assertj-tests/assertj-integration-tests/assertj-core-groovy/src/test/groovy/org/assertj/tests/core/groovy/Assertions_assertThat_with_Groovy_strings_Test.groovy @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.tests.groovy +package org.assertj.tests.core.groovy import org.junit.jupiter.api.Test diff --git a/assertj-tests/assertj-integration-tests/assertj-core-groovy/src/test/groovy/org/assertj/core/tests/groovy/StandardRepresentation_using_GString_Test.groovy b/assertj-tests/assertj-integration-tests/assertj-core-groovy/src/test/groovy/org/assertj/tests/core/groovy/StandardRepresentation_using_GString_Test.groovy similarity index 97% rename from assertj-tests/assertj-integration-tests/assertj-core-groovy/src/test/groovy/org/assertj/core/tests/groovy/StandardRepresentation_using_GString_Test.groovy rename to assertj-tests/assertj-integration-tests/assertj-core-groovy/src/test/groovy/org/assertj/tests/core/groovy/StandardRepresentation_using_GString_Test.groovy index e652f67014..b31d3c6805 100644 --- a/assertj-tests/assertj-integration-tests/assertj-core-groovy/src/test/groovy/org/assertj/core/tests/groovy/StandardRepresentation_using_GString_Test.groovy +++ b/assertj-tests/assertj-integration-tests/assertj-core-groovy/src/test/groovy/org/assertj/tests/core/groovy/StandardRepresentation_using_GString_Test.groovy @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.tests.groovy +package org.assertj.tests.core.groovy import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.BeforeEach diff --git a/assertj-tests/assertj-integration-tests/assertj-core-java-17/src/test/java/org/assertj/core/tests/java17/AssertionUtil.java b/assertj-tests/assertj-integration-tests/assertj-core-java-17/src/test/java/org/assertj/tests/core/java17/AssertionUtil.java similarity index 96% rename from assertj-tests/assertj-integration-tests/assertj-core-java-17/src/test/java/org/assertj/core/tests/java17/AssertionUtil.java rename to assertj-tests/assertj-integration-tests/assertj-core-java-17/src/test/java/org/assertj/tests/core/java17/AssertionUtil.java index 2522dd9467..996f5b4242 100644 --- a/assertj-tests/assertj-integration-tests/assertj-core-java-17/src/test/java/org/assertj/core/tests/java17/AssertionUtil.java +++ b/assertj-tests/assertj-integration-tests/assertj-core-java-17/src/test/java/org/assertj/tests/core/java17/AssertionUtil.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.tests.java17; +package org.assertj.tests.core.java17; import org.assertj.core.api.ThrowableAssert; diff --git a/assertj-tests/assertj-integration-tests/assertj-core-java-17/src/test/java/org/assertj/core/tests/java17/Assertions_assertThat_with_Class_Test.java b/assertj-tests/assertj-integration-tests/assertj-core-java-17/src/test/java/org/assertj/tests/core/java17/Assertions_assertThat_with_Class_Test.java similarity index 97% rename from assertj-tests/assertj-integration-tests/assertj-core-java-17/src/test/java/org/assertj/core/tests/java17/Assertions_assertThat_with_Class_Test.java rename to assertj-tests/assertj-integration-tests/assertj-core-java-17/src/test/java/org/assertj/tests/core/java17/Assertions_assertThat_with_Class_Test.java index 4c97a3a725..15d749e944 100644 --- a/assertj-tests/assertj-integration-tests/assertj-core-java-17/src/test/java/org/assertj/core/tests/java17/Assertions_assertThat_with_Class_Test.java +++ b/assertj-tests/assertj-integration-tests/assertj-core-java-17/src/test/java/org/assertj/tests/core/java17/Assertions_assertThat_with_Class_Test.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.tests.java17; +package org.assertj.tests.core.java17; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.BDDAssertions.then; @@ -18,8 +18,8 @@ import static org.assertj.core.error.ShouldBeSealed.shouldBeSealed; import static org.assertj.core.error.ShouldBeSealed.shouldNotBeSealed; import static org.assertj.core.error.ShouldHaveRecordComponents.shouldHaveRecordComponents; -import static org.assertj.core.tests.java17.AssertionUtil.expectAssertionError; import static org.assertj.core.util.Sets.set; +import static org.assertj.tests.core.java17.AssertionUtil.expectAssertionError; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/assertj-tests/assertj-integration-tests/assertj-core-java-17/src/test/java/org/assertj/core/tests/java17/ClassAssert_hasPermittedSubclasses_Test.java b/assertj-tests/assertj-integration-tests/assertj-core-java-17/src/test/java/org/assertj/tests/core/java17/ClassAssert_hasPermittedSubclasses_Test.java similarity index 96% rename from assertj-tests/assertj-integration-tests/assertj-core-java-17/src/test/java/org/assertj/core/tests/java17/ClassAssert_hasPermittedSubclasses_Test.java rename to assertj-tests/assertj-integration-tests/assertj-core-java-17/src/test/java/org/assertj/tests/core/java17/ClassAssert_hasPermittedSubclasses_Test.java index 6cf9abfca2..ef51be7af7 100644 --- a/assertj-tests/assertj-integration-tests/assertj-core-java-17/src/test/java/org/assertj/core/tests/java17/ClassAssert_hasPermittedSubclasses_Test.java +++ b/assertj-tests/assertj-integration-tests/assertj-core-java-17/src/test/java/org/assertj/tests/core/java17/ClassAssert_hasPermittedSubclasses_Test.java @@ -10,14 +10,14 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.tests.java17; +package org.assertj.tests.core.java17; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.error.ShouldHavePermittedSubclasses.shouldHavePermittedSubclasses; -import static org.assertj.core.tests.java17.AssertionUtil.expectAssertionError; import static org.assertj.core.util.Arrays.array; +import static org.assertj.tests.core.java17.AssertionUtil.expectAssertionError; import java.util.List; diff --git a/assertj-tests/assertj-integration-tests/assertj-core-junit4-with-opentest4j/src/test/java/org/assertj/core/tests/JUnit4_with_opentest4j_Test.java b/assertj-tests/assertj-integration-tests/assertj-core-junit4-with-opentest4j/src/test/java/org/assertj/tests/core/JUnit4_with_opentest4j_Test.java similarity index 98% rename from assertj-tests/assertj-integration-tests/assertj-core-junit4-with-opentest4j/src/test/java/org/assertj/core/tests/JUnit4_with_opentest4j_Test.java rename to assertj-tests/assertj-integration-tests/assertj-core-junit4-with-opentest4j/src/test/java/org/assertj/tests/core/JUnit4_with_opentest4j_Test.java index 573ff2d6ab..0a31330614 100644 --- a/assertj-tests/assertj-integration-tests/assertj-core-junit4-with-opentest4j/src/test/java/org/assertj/core/tests/JUnit4_with_opentest4j_Test.java +++ b/assertj-tests/assertj-integration-tests/assertj-core-junit4-with-opentest4j/src/test/java/org/assertj/tests/core/JUnit4_with_opentest4j_Test.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.tests; +package org.assertj.tests.core; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; diff --git a/assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/core/tests/kotlin/Assertions_assertThat_Test.kt b/assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/tests/core/kotlin/Assertions_assertThat_Test.kt similarity index 97% rename from assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/core/tests/kotlin/Assertions_assertThat_Test.kt rename to assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/tests/core/kotlin/Assertions_assertThat_Test.kt index 0142a5bc95..0fd3107a6f 100644 --- a/assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/core/tests/kotlin/Assertions_assertThat_Test.kt +++ b/assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/tests/core/kotlin/Assertions_assertThat_Test.kt @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.tests.kotlin +package org.assertj.tests.core.kotlin import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test diff --git a/assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/core/tests/kotlin/Assertions_catchThrowableOfType_Test.kt b/assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/tests/core/kotlin/Assertions_catchThrowableOfType_Test.kt similarity index 96% rename from assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/core/tests/kotlin/Assertions_catchThrowableOfType_Test.kt rename to assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/tests/core/kotlin/Assertions_catchThrowableOfType_Test.kt index 7e166b6bb4..3853049498 100644 --- a/assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/core/tests/kotlin/Assertions_catchThrowableOfType_Test.kt +++ b/assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/tests/core/kotlin/Assertions_catchThrowableOfType_Test.kt @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.tests.kotlin +package org.assertj.tests.core.kotlin import org.assertj.core.api.Assertions.catchThrowableOfType import org.assertj.core.api.BDDAssertions.then diff --git a/assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/core/tests/kotlin/Assertions_describedAs_text_supplier_Test.kt b/assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/tests/core/kotlin/Assertions_describedAs_text_supplier_Test.kt similarity index 94% rename from assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/core/tests/kotlin/Assertions_describedAs_text_supplier_Test.kt rename to assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/tests/core/kotlin/Assertions_describedAs_text_supplier_Test.kt index 6b65fbdf27..926ecf8832 100644 --- a/assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/core/tests/kotlin/Assertions_describedAs_text_supplier_Test.kt +++ b/assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/tests/core/kotlin/Assertions_describedAs_text_supplier_Test.kt @@ -10,13 +10,13 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.tests.kotlin +package org.assertj.tests.core.kotlin import org.assertj.core.api.Assertions import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.BDDAssertions.then -import org.assertj.core.tests.kotlin.testkit.AssertionsUtil.expectAssertionError -import org.assertj.core.tests.kotlin.testkit.ConcreteAssert +import org.assertj.tests.core.kotlin.testkit.AssertionsUtil.expectAssertionError +import org.assertj.tests.core.kotlin.testkit.ConcreteAssert import org.junit.jupiter.api.Test import java.util.concurrent.atomic.AtomicBoolean import java.util.function.Supplier diff --git a/assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/core/tests/kotlin/testkit/AssertionsUtil.kt b/assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/tests/core/kotlin/testkit/AssertionsUtil.kt similarity index 96% rename from assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/core/tests/kotlin/testkit/AssertionsUtil.kt rename to assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/tests/core/kotlin/testkit/AssertionsUtil.kt index 8ea3b0b58d..585313755c 100644 --- a/assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/core/tests/kotlin/testkit/AssertionsUtil.kt +++ b/assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/tests/core/kotlin/testkit/AssertionsUtil.kt @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.tests.kotlin.testkit +package org.assertj.tests.core.kotlin.testkit import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.catchThrowableOfType diff --git a/assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/core/tests/kotlin/testkit/ConcreteAssert.kt b/assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/tests/core/kotlin/testkit/ConcreteAssert.kt similarity index 98% rename from assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/core/tests/kotlin/testkit/ConcreteAssert.kt rename to assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/tests/core/kotlin/testkit/ConcreteAssert.kt index c7ec0b8459..036fd5f7b5 100644 --- a/assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/core/tests/kotlin/testkit/ConcreteAssert.kt +++ b/assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/tests/core/kotlin/testkit/ConcreteAssert.kt @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.tests.kotlin.testkit +package org.assertj.tests.core.kotlin.testkit import org.assertj.core.api.AbstractAssert import org.assertj.core.internal.Objects diff --git a/assertj-tests/assertj-integration-tests/assertj-core-osgi/src/test/java/org/assertj/core/tests/osgi/AssumptionsTest.java b/assertj-tests/assertj-integration-tests/assertj-core-osgi/src/test/java/org/assertj/tests/core/osgi/AssumptionsTest.java similarity index 98% rename from assertj-tests/assertj-integration-tests/assertj-core-osgi/src/test/java/org/assertj/core/tests/osgi/AssumptionsTest.java rename to assertj-tests/assertj-integration-tests/assertj-core-osgi/src/test/java/org/assertj/tests/core/osgi/AssumptionsTest.java index b93600332e..bd0e677964 100644 --- a/assertj-tests/assertj-integration-tests/assertj-core-osgi/src/test/java/org/assertj/core/tests/osgi/AssumptionsTest.java +++ b/assertj-tests/assertj-integration-tests/assertj-core-osgi/src/test/java/org/assertj/tests/core/osgi/AssumptionsTest.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.tests.osgi; +package org.assertj.tests.core.osgi; import static java.lang.String.CASE_INSENSITIVE_ORDER; import static java.util.Arrays.asList; diff --git a/assertj-tests/assertj-integration-tests/assertj-core-osgi/src/test/java/org/assertj/core/tests/osgi/SimpleTest.java b/assertj-tests/assertj-integration-tests/assertj-core-osgi/src/test/java/org/assertj/tests/core/osgi/SimpleTest.java similarity index 96% rename from assertj-tests/assertj-integration-tests/assertj-core-osgi/src/test/java/org/assertj/core/tests/osgi/SimpleTest.java rename to assertj-tests/assertj-integration-tests/assertj-core-osgi/src/test/java/org/assertj/tests/core/osgi/SimpleTest.java index f8e192de3a..0dc023c52f 100644 --- a/assertj-tests/assertj-integration-tests/assertj-core-osgi/src/test/java/org/assertj/core/tests/osgi/SimpleTest.java +++ b/assertj-tests/assertj-integration-tests/assertj-core-osgi/src/test/java/org/assertj/tests/core/osgi/SimpleTest.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.tests.osgi; +package org.assertj.tests.core.osgi; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; diff --git a/assertj-tests/assertj-integration-tests/assertj-core-osgi/src/test/java/org/assertj/core/tests/osgi/soft/CustomSoftAssertionTest.java b/assertj-tests/assertj-integration-tests/assertj-core-osgi/src/test/java/org/assertj/tests/core/osgi/soft/CustomSoftAssertionTest.java similarity index 98% rename from assertj-tests/assertj-integration-tests/assertj-core-osgi/src/test/java/org/assertj/core/tests/osgi/soft/CustomSoftAssertionTest.java rename to assertj-tests/assertj-integration-tests/assertj-core-osgi/src/test/java/org/assertj/tests/core/osgi/soft/CustomSoftAssertionTest.java index 55eaf9cd0d..82edd22afd 100644 --- a/assertj-tests/assertj-integration-tests/assertj-core-osgi/src/test/java/org/assertj/core/tests/osgi/soft/CustomSoftAssertionTest.java +++ b/assertj-tests/assertj-integration-tests/assertj-core-osgi/src/test/java/org/assertj/tests/core/osgi/soft/CustomSoftAssertionTest.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.tests.osgi.soft; +package org.assertj.tests.core.osgi.soft; import static org.assertj.core.api.BDDAssertions.then; diff --git a/assertj-tests/assertj-integration-tests/assertj-core-testng-with-junit4/src/test/java/org/assertj/core/tests/TestNG_with_JUnit4_Test.java b/assertj-tests/assertj-integration-tests/assertj-core-testng-with-junit4/src/test/java/org/assertj/tests/core/TestNG_with_JUnit4_Test.java similarity index 98% rename from assertj-tests/assertj-integration-tests/assertj-core-testng-with-junit4/src/test/java/org/assertj/core/tests/TestNG_with_JUnit4_Test.java rename to assertj-tests/assertj-integration-tests/assertj-core-testng-with-junit4/src/test/java/org/assertj/tests/core/TestNG_with_JUnit4_Test.java index 0b84d45d34..f249060e3a 100644 --- a/assertj-tests/assertj-integration-tests/assertj-core-testng-with-junit4/src/test/java/org/assertj/core/tests/TestNG_with_JUnit4_Test.java +++ b/assertj-tests/assertj-integration-tests/assertj-core-testng-with-junit4/src/test/java/org/assertj/tests/core/TestNG_with_JUnit4_Test.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.tests; +package org.assertj.tests.core; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; diff --git a/assertj-tests/assertj-performance-tests/src/test/java/org/assertj/core/tests/perf/ContainsOnlyPerfTest.java b/assertj-tests/assertj-performance-tests/src/test/java/org/assertj/tests/core/perf/ContainsOnlyPerfTest.java similarity index 98% rename from assertj-tests/assertj-performance-tests/src/test/java/org/assertj/core/tests/perf/ContainsOnlyPerfTest.java rename to assertj-tests/assertj-performance-tests/src/test/java/org/assertj/tests/core/perf/ContainsOnlyPerfTest.java index 4ab116b553..3b969acd57 100644 --- a/assertj-tests/assertj-performance-tests/src/test/java/org/assertj/core/tests/perf/ContainsOnlyPerfTest.java +++ b/assertj-tests/assertj-performance-tests/src/test/java/org/assertj/tests/core/perf/ContainsOnlyPerfTest.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.tests.perf; +package org.assertj.tests.core.perf; import static java.lang.Boolean.FALSE; import static java.lang.Boolean.TRUE; diff --git a/assertj-tests/assertj-performance-tests/src/test/java/org/assertj/core/tests/perf/SoftAssertionsPerfTest.java b/assertj-tests/assertj-performance-tests/src/test/java/org/assertj/tests/core/perf/SoftAssertionsPerfTest.java similarity index 99% rename from assertj-tests/assertj-performance-tests/src/test/java/org/assertj/core/tests/perf/SoftAssertionsPerfTest.java rename to assertj-tests/assertj-performance-tests/src/test/java/org/assertj/tests/core/perf/SoftAssertionsPerfTest.java index 497a4a5d6a..d3bfc1fd3d 100644 --- a/assertj-tests/assertj-performance-tests/src/test/java/org/assertj/core/tests/perf/SoftAssertionsPerfTest.java +++ b/assertj-tests/assertj-performance-tests/src/test/java/org/assertj/tests/core/perf/SoftAssertionsPerfTest.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.tests.perf; +package org.assertj.tests.core.perf; import static java.lang.String.format; import static java.util.Arrays.asList; diff --git a/assertj-tests/assertj-performance-tests/src/test/java/org/assertj/core/tests/perf/TypeComparatorsPerfTest.java b/assertj-tests/assertj-performance-tests/src/test/java/org/assertj/tests/core/perf/TypeComparatorsPerfTest.java similarity index 97% rename from assertj-tests/assertj-performance-tests/src/test/java/org/assertj/core/tests/perf/TypeComparatorsPerfTest.java rename to assertj-tests/assertj-performance-tests/src/test/java/org/assertj/tests/core/perf/TypeComparatorsPerfTest.java index d3587d3c1c..f3f47a1225 100644 --- a/assertj-tests/assertj-performance-tests/src/test/java/org/assertj/core/tests/perf/TypeComparatorsPerfTest.java +++ b/assertj-tests/assertj-performance-tests/src/test/java/org/assertj/tests/core/perf/TypeComparatorsPerfTest.java @@ -10,7 +10,7 @@ * * Copyright 2012-2024 the original author or authors. */ -package org.assertj.core.tests.perf; +package org.assertj.tests.core.perf; import static org.assertj.core.api.Assertions.assertThat;