From a43399accf5acf936e085ffa537f71f4a26e5d08 Mon Sep 17 00:00:00 2001 From: Stefano Cordio Date: Fri, 17 Jun 2022 23:57:28 +0200 Subject: [PATCH] Let `CaseInsensitiveStringComparator` delegate to `String` comparator Fixes #2663. --- pom.xml | 6 +++++ ...ssertThat_with_Stream_startsWith_Test.java | 2 +- .../assertj/core/api/SoftAssertionsTest.java | 2 +- .../Assumptions_assumeThat_Test.java | 2 +- ...terableAssert_extractingResultOf_Test.java | 2 +- ...xtractingResultOf_with_SortedSet_Test.java | 2 +- ...redOnAssertions_ThrowingConsumer_Test.java | 2 +- ...rt_filteredOnAssertions_consumer_Test.java | 2 +- ...rableAssert_filteredOn_condition_Test.java | 2 +- ...rableAssert_filteredOn_predicate_Test.java | 2 +- ...racting_with_multiple_extractors_Test.java | 2 +- ...ctArrayAssert_extractingResultOf_Test.java | 2 +- ...ArrayAssert_filteredOnAssertions_Test.java | 2 +- ...redOnAssertions_ThrowingConsumer_Test.java | 2 +- ...t_isEqualTo_withFieldComparators_Test.java | 2 +- ...rt_isEqualTo_withTypeComparators_Test.java | 2 +- .../core/error/ShouldBeEqual_Test.java | 2 +- .../core/error/ShouldBeIn_create_Test.java | 2 +- ...rtedAccordingToComparator_create_Test.java | 2 +- .../error/ShouldBeSubsetOf_create_Test.java | 2 +- .../ShouldBeSubstringOf_create_Test.java | 2 +- .../error/ShouldContainAnyOf_create_Test.java | 2 +- .../ShouldContainAtIndex_create_Test.java | 2 +- ...ntainCharSequenceOnlyOnce_create_Test.java | 2 +- ...ShouldContainCharSequence_create_Test.java | 2 +- ...dContainExactlyInAnyOrder_create_Test.java | 2 +- .../ShouldContainExactly_create_Test.java | 2 +- .../error/ShouldContainOnly_create_Test.java | 2 +- ...ainSequenceOfCharSequence_create_Test.java | 2 +- .../ShouldContainSequence_create_Test.java | 2 +- ...SubsequenceOfCharSequence_create_Test.java | 2 +- .../ShouldContainSubsequence_create_Test.java | 2 +- .../core/error/ShouldContain_create_Test.java | 2 +- .../ShouldContainsOnlyOnce_create_Test.java | 2 +- .../core/error/ShouldEndWith_create_Test.java | 2 +- ...entsAccordingToComparator_create_Test.java | 2 +- .../error/ShouldNotBeEqual_create_Test.java | 2 +- .../core/error/ShouldNotBeIn_create_Test.java | 2 +- .../ShouldNotContainAtIndex_create_Test.java | 2 +- ...uldNotContainCharSequence_create_Test.java | 2 +- .../ShouldNotContainSequence_create_Test.java | 2 +- ...ouldNotContainSubsequence_create_Test.java | 2 +- .../error/ShouldNotContain_create_Test.java | 2 +- ...uldNotEndWithIgnoringCase_create_Test.java | 2 +- .../error/ShouldNotEndWith_create_Test.java | 2 +- .../ShouldNotHaveDuplicates_create_Test.java | 2 +- .../error/ShouldNotStartWith_create_Test.java | 2 +- .../error/ShouldStartWith_create_Test.java | 2 +- ...est_ComparatorBasedComparisonStrategy.java | 2 ++ .../assertj/core/internal/BaseArraysTest.java | 4 +-- ...ComparisonStrategy_isGreaterThan_Test.java | 1 + .../core/internal/IterableDiff_Test.java | 2 +- .../core/internal/IterablesBaseTest.java | 4 +-- .../assertj/core/internal/ListsBaseTest.java | 4 +-- .../core/internal/ObjectArraysBaseTest.java | 4 +-- .../core/internal/ObjectsBaseTest.java | 2 +- .../core/internal/StringsBaseTest.java | 2 +- .../CaseInsensitiveStringComparator.java | 7 ++--- .../CaseInsensitiveStringComparatorTest.java} | 26 ++++++++++++------- ...CaseInsensitiveCharSequenceComparator.java | 2 ++ 60 files changed, 89 insertions(+), 71 deletions(-) rename src/test/java/org/assertj/core/{util => test}/CaseInsensitiveStringComparator.java (91%) rename src/test/java/org/assertj/core/{internal/CaseInsensitiveStringComparator.java => test/CaseInsensitiveStringComparatorTest.java} (55%) diff --git a/pom.xml b/pom.xml index 7f2421d768c..92d719ba6c9 100644 --- a/pom.xml +++ b/pom.xml @@ -180,6 +180,12 @@ + + org.junit-pioneer + junit-pioneer + 1.7.1 + test + org.junit.platform junit-platform-testkit diff --git a/src/test/java/org/assertj/core/api/Assertions_assertThat_with_Stream_startsWith_Test.java b/src/test/java/org/assertj/core/api/Assertions_assertThat_with_Stream_startsWith_Test.java index d0c91580044..cbaf3e9a0af 100644 --- a/src/test/java/org/assertj/core/api/Assertions_assertThat_with_Stream_startsWith_Test.java +++ b/src/test/java/org/assertj/core/api/Assertions_assertThat_with_Stream_startsWith_Test.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.stream.Stream; -import org.assertj.core.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/assertj/core/api/SoftAssertionsTest.java b/src/test/java/org/assertj/core/api/SoftAssertionsTest.java index cc985c56f76..658a5547c14 100644 --- a/src/test/java/org/assertj/core/api/SoftAssertionsTest.java +++ b/src/test/java/org/assertj/core/api/SoftAssertionsTest.java @@ -96,9 +96,9 @@ 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.util.CaseInsensitiveStringComparator; import org.assertj.core.util.Lists; import org.assertj.core.util.VisibleForTesting; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/assertj/core/api/assumptions/Assumptions_assumeThat_Test.java b/src/test/java/org/assertj/core/api/assumptions/Assumptions_assumeThat_Test.java index dba6e36d51f..0c2aa0270b2 100644 --- a/src/test/java/org/assertj/core/api/assumptions/Assumptions_assumeThat_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; class Assumptions_assumeThat_Test { diff --git a/src/test/java/org/assertj/core/api/iterable/IterableAssert_extractingResultOf_Test.java b/src/test/java/org/assertj/core/api/iterable/IterableAssert_extractingResultOf_Test.java index a0ac3d6744d..18ca9bc2b36 100644 --- a/src/test/java/org/assertj/core/api/iterable/IterableAssert_extractingResultOf_Test.java +++ b/src/test/java/org/assertj/core/api/iterable/IterableAssert_extractingResultOf_Test.java @@ -27,9 +27,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.util.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/assertj/core/api/iterable/IterableAssert_extractingResultOf_with_SortedSet_Test.java b/src/test/java/org/assertj/core/api/iterable/IterableAssert_extractingResultOf_with_SortedSet_Test.java index 6053926f59a..ccd5ecf38d4 100644 --- a/src/test/java/org/assertj/core/api/iterable/IterableAssert_extractingResultOf_with_SortedSet_Test.java +++ b/src/test/java/org/assertj/core/api/iterable/IterableAssert_extractingResultOf_with_SortedSet_Test.java @@ -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.util.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOnAssertions_ThrowingConsumer_Test.java b/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOnAssertions_ThrowingConsumer_Test.java index f20f4c6fc45..8fcd4bc8b29 100644 --- a/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOnAssertions_ThrowingConsumer_Test.java +++ b/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.util.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; class IterableAssert_filteredOnAssertions_ThrowingConsumer_Test extends IterableAssert_filtered_baseTest { diff --git a/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOnAssertions_consumer_Test.java b/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOnAssertions_consumer_Test.java index e7cf2ae21f2..c20d97c8f5d 100644 --- a/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOnAssertions_consumer_Test.java +++ b/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.util.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; class IterableAssert_filteredOnAssertions_consumer_Test extends IterableAssert_filtered_baseTest { diff --git a/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_condition_Test.java b/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_condition_Test.java index 96cc8ab1c11..5bbbaa47e66 100644 --- a/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_condition_Test.java +++ b/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.util.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_predicate_Test.java b/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_predicate_Test.java index 6910c36be3d..9eab244f489 100644 --- a/src/test/java/org/assertj/core/api/iterable/IterableAssert_filteredOn_predicate_Test.java +++ b/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.util.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; class IterableAssert_filteredOn_predicate_Test extends IterableAssert_filtered_baseTest { diff --git a/src/test/java/org/assertj/core/api/iterable/IterableAssert_flatExtracting_with_multiple_extractors_Test.java b/src/test/java/org/assertj/core/api/iterable/IterableAssert_flatExtracting_with_multiple_extractors_Test.java index 0b490f00ca2..3a01ec310c3 100644 --- a/src/test/java/org/assertj/core/api/iterable/IterableAssert_flatExtracting_with_multiple_extractors_Test.java +++ b/src/test/java/org/assertj/core/api/iterable/IterableAssert_flatExtracting_with_multiple_extractors_Test.java @@ -36,7 +36,7 @@ import org.assertj.core.api.AbstractListAssert; import org.assertj.core.data.TolkienCharacter; -import org.assertj.core.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_extractingResultOf_Test.java b/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_extractingResultOf_Test.java index a9d23c9d2a2..8251634c64c 100644 --- a/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_extractingResultOf_Test.java +++ b/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_extractingResultOf_Test.java @@ -27,9 +27,9 @@ 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.util.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOnAssertions_Test.java b/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOnAssertions_Test.java index 4ad735d1d22..ca5e418d60a 100644 --- a/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOnAssertions_Test.java +++ b/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.util.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; class ObjectArrayAssert_filteredOnAssertions_Test extends ObjectArrayAssert_filtered_baseTest { diff --git a/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOnAssertions_ThrowingConsumer_Test.java b/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOnAssertions_ThrowingConsumer_Test.java index 09d3ff28b5e..a355118ec31 100644 --- a/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_filteredOnAssertions_ThrowingConsumer_Test.java +++ b/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.util.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; class ObjectArrayAssert_filteredOnAssertions_ThrowingConsumer_Test extends ObjectArrayAssert_filtered_baseTest { diff --git a/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_withFieldComparators_Test.java b/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_withFieldComparators_Test.java index fd8e977b2a1..fde88f3ac04 100644 --- a/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_withFieldComparators_Test.java +++ b/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_withFieldComparators_Test.java @@ -33,10 +33,10 @@ import org.assertj.core.api.RecursiveComparisonAssert_isEqualTo_BaseTest; import org.assertj.core.internal.AtPrecisionComparator; -import org.assertj.core.internal.CaseInsensitiveStringComparator; 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.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_withTypeComparators_Test.java b/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_withTypeComparators_Test.java index 430fa1e1c3d..18b918432ac 100644 --- a/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_withTypeComparators_Test.java +++ b/src/test/java/org/assertj/core/api/recursive/comparison/RecursiveComparisonAssert_isEqualTo_withTypeComparators_Test.java @@ -33,13 +33,13 @@ import org.assertj.core.api.RecursiveComparisonAssert_isEqualTo_BaseTest; import org.assertj.core.data.MapEntry; import org.assertj.core.internal.AtPrecisionComparator; -import org.assertj.core.internal.CaseInsensitiveStringComparator; import org.assertj.core.internal.objects.data.Address; 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.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/org/assertj/core/error/ShouldBeEqual_Test.java b/src/test/java/org/assertj/core/error/ShouldBeEqual_Test.java index a7b3094c33d..b14902fd60a 100644 --- a/src/test/java/org/assertj/core/error/ShouldBeEqual_Test.java +++ b/src/test/java/org/assertj/core/error/ShouldBeEqual_Test.java @@ -24,7 +24,7 @@ import java.util.Objects; import org.assertj.core.api.ThrowableAssert.ThrowingCallable; -import org.assertj.core.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.opentest4j.AssertionFailedError; diff --git a/src/test/java/org/assertj/core/error/ShouldBeIn_create_Test.java b/src/test/java/org/assertj/core/error/ShouldBeIn_create_Test.java index 0f3ba42c778..9951f7277e3 100644 --- a/src/test/java/org/assertj/core/error/ShouldBeIn_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/assertj/core/error/ShouldBeSortedAccordingToComparator_create_Test.java b/src/test/java/org/assertj/core/error/ShouldBeSortedAccordingToComparator_create_Test.java index de07cd81c1c..a0ac9d7197d 100644 --- a/src/test/java/org/assertj/core/error/ShouldBeSortedAccordingToComparator_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/assertj/core/error/ShouldBeSubsetOf_create_Test.java b/src/test/java/org/assertj/core/error/ShouldBeSubsetOf_create_Test.java index 42210a9c862..c4f03d42386 100644 --- a/src/test/java/org/assertj/core/error/ShouldBeSubsetOf_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/assertj/core/error/ShouldBeSubstringOf_create_Test.java b/src/test/java/org/assertj/core/error/ShouldBeSubstringOf_create_Test.java index d09093f0a64..caf0502dbff 100644 --- a/src/test/java/org/assertj/core/error/ShouldBeSubstringOf_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; class ShouldBeSubstringOf_create_Test { diff --git a/src/test/java/org/assertj/core/error/ShouldContainAnyOf_create_Test.java b/src/test/java/org/assertj/core/error/ShouldContainAnyOf_create_Test.java index ec097c34ad8..fa33bfbcb5e 100644 --- a/src/test/java/org/assertj/core/error/ShouldContainAnyOf_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; class ShouldContainAnyOf_create_Test { diff --git a/src/test/java/org/assertj/core/error/ShouldContainAtIndex_create_Test.java b/src/test/java/org/assertj/core/error/ShouldContainAtIndex_create_Test.java index 25e09fd8da1..907ed7b70d4 100644 --- a/src/test/java/org/assertj/core/error/ShouldContainAtIndex_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/assertj/core/error/ShouldContainCharSequenceOnlyOnce_create_Test.java b/src/test/java/org/assertj/core/error/ShouldContainCharSequenceOnlyOnce_create_Test.java index a27828beb6d..257e4a494d1 100644 --- a/src/test/java/org/assertj/core/error/ShouldContainCharSequenceOnlyOnce_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/assertj/core/error/ShouldContainCharSequence_create_Test.java b/src/test/java/org/assertj/core/error/ShouldContainCharSequence_create_Test.java index f2a7a8810d6..4a215c50b07 100644 --- a/src/test/java/org/assertj/core/error/ShouldContainCharSequence_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/assertj/core/error/ShouldContainExactlyInAnyOrder_create_Test.java b/src/test/java/org/assertj/core/error/ShouldContainExactlyInAnyOrder_create_Test.java index d6f39201590..76bdedc9974 100644 --- a/src/test/java/org/assertj/core/error/ShouldContainExactlyInAnyOrder_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/assertj/core/error/ShouldContainExactly_create_Test.java b/src/test/java/org/assertj/core/error/ShouldContainExactly_create_Test.java index 708414542e9..7b58bb23c31 100644 --- a/src/test/java/org/assertj/core/error/ShouldContainExactly_create_Test.java +++ b/src/test/java/org/assertj/core/error/ShouldContainExactly_create_Test.java @@ -23,7 +23,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; -import org.assertj.core.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; class ShouldContainExactly_create_Test { diff --git a/src/test/java/org/assertj/core/error/ShouldContainOnly_create_Test.java b/src/test/java/org/assertj/core/error/ShouldContainOnly_create_Test.java index 5b5af2273f8..0fc92bcc66a 100644 --- a/src/test/java/org/assertj/core/error/ShouldContainOnly_create_Test.java +++ b/src/test/java/org/assertj/core/error/ShouldContainOnly_create_Test.java @@ -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.util.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/assertj/core/error/ShouldContainSequenceOfCharSequence_create_Test.java b/src/test/java/org/assertj/core/error/ShouldContainSequenceOfCharSequence_create_Test.java index d92006979d8..348ccb8ad35 100644 --- a/src/test/java/org/assertj/core/error/ShouldContainSequenceOfCharSequence_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/assertj/core/error/ShouldContainSequence_create_Test.java b/src/test/java/org/assertj/core/error/ShouldContainSequence_create_Test.java index 26119699b09..2339359af6c 100644 --- a/src/test/java/org/assertj/core/error/ShouldContainSequence_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/assertj/core/error/ShouldContainSubsequenceOfCharSequence_create_Test.java b/src/test/java/org/assertj/core/error/ShouldContainSubsequenceOfCharSequence_create_Test.java index 38564274919..c608c9f9065 100644 --- a/src/test/java/org/assertj/core/error/ShouldContainSubsequenceOfCharSequence_create_Test.java +++ b/src/test/java/org/assertj/core/error/ShouldContainSubsequenceOfCharSequence_create_Test.java @@ -19,7 +19,7 @@ import org.assertj.core.description.TextDescription; import org.assertj.core.internal.ComparatorBasedComparisonStrategy; import org.assertj.core.presentation.StandardRepresentation; -import org.assertj.core.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/assertj/core/error/ShouldContainSubsequence_create_Test.java b/src/test/java/org/assertj/core/error/ShouldContainSubsequence_create_Test.java index 10642a2654b..a127884b1a9 100644 --- a/src/test/java/org/assertj/core/error/ShouldContainSubsequence_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/assertj/core/error/ShouldContain_create_Test.java b/src/test/java/org/assertj/core/error/ShouldContain_create_Test.java index 3620fab124f..9bfc7c8457c 100644 --- a/src/test/java/org/assertj/core/error/ShouldContain_create_Test.java +++ b/src/test/java/org/assertj/core/error/ShouldContain_create_Test.java @@ -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.util.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/assertj/core/error/ShouldContainsOnlyOnce_create_Test.java b/src/test/java/org/assertj/core/error/ShouldContainsOnlyOnce_create_Test.java index 59496ffa50a..3f4b3a19b56 100644 --- a/src/test/java/org/assertj/core/error/ShouldContainsOnlyOnce_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/assertj/core/error/ShouldEndWith_create_Test.java b/src/test/java/org/assertj/core/error/ShouldEndWith_create_Test.java index 05752324a93..2642a90860d 100644 --- a/src/test/java/org/assertj/core/error/ShouldEndWith_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/assertj/core/error/ShouldHaveComparableElementsAccordingToComparator_create_Test.java b/src/test/java/org/assertj/core/error/ShouldHaveComparableElementsAccordingToComparator_create_Test.java index 1fe73bbfcd6..e02a131760a 100644 --- a/src/test/java/org/assertj/core/error/ShouldHaveComparableElementsAccordingToComparator_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/assertj/core/error/ShouldNotBeEqual_create_Test.java b/src/test/java/org/assertj/core/error/ShouldNotBeEqual_create_Test.java index 48fb2e9b08d..a4134301719 100644 --- a/src/test/java/org/assertj/core/error/ShouldNotBeEqual_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/assertj/core/error/ShouldNotBeIn_create_Test.java b/src/test/java/org/assertj/core/error/ShouldNotBeIn_create_Test.java index c7bdbff0990..54cc530cd23 100644 --- a/src/test/java/org/assertj/core/error/ShouldNotBeIn_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/assertj/core/error/ShouldNotContainAtIndex_create_Test.java b/src/test/java/org/assertj/core/error/ShouldNotContainAtIndex_create_Test.java index 2bcd11cda30..7b8243a56fd 100644 --- a/src/test/java/org/assertj/core/error/ShouldNotContainAtIndex_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/assertj/core/error/ShouldNotContainCharSequence_create_Test.java b/src/test/java/org/assertj/core/error/ShouldNotContainCharSequence_create_Test.java index ddbda29299f..357e90a6f8b 100644 --- a/src/test/java/org/assertj/core/error/ShouldNotContainCharSequence_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/assertj/core/error/ShouldNotContainSequence_create_Test.java b/src/test/java/org/assertj/core/error/ShouldNotContainSequence_create_Test.java index 68912d86db9..e7038c42d64 100644 --- a/src/test/java/org/assertj/core/error/ShouldNotContainSequence_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; class ShouldNotContainSequence_create_Test { diff --git a/src/test/java/org/assertj/core/error/ShouldNotContainSubsequence_create_Test.java b/src/test/java/org/assertj/core/error/ShouldNotContainSubsequence_create_Test.java index 4ffb4a909b8..915e10849e2 100644 --- a/src/test/java/org/assertj/core/error/ShouldNotContainSubsequence_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; class ShouldNotContainSubsequence_create_Test { diff --git a/src/test/java/org/assertj/core/error/ShouldNotContain_create_Test.java b/src/test/java/org/assertj/core/error/ShouldNotContain_create_Test.java index 9ed504e2b53..23629c8ba85 100644 --- a/src/test/java/org/assertj/core/error/ShouldNotContain_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/assertj/core/error/ShouldNotEndWithIgnoringCase_create_Test.java b/src/test/java/org/assertj/core/error/ShouldNotEndWithIgnoringCase_create_Test.java index 120ca5ca738..57ac07810b4 100644 --- a/src/test/java/org/assertj/core/error/ShouldNotEndWithIgnoringCase_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; class ShouldNotEndWithIgnoringCase_create_Test { diff --git a/src/test/java/org/assertj/core/error/ShouldNotEndWith_create_Test.java b/src/test/java/org/assertj/core/error/ShouldNotEndWith_create_Test.java index 8ac7caac3c0..79912062aa2 100644 --- a/src/test/java/org/assertj/core/error/ShouldNotEndWith_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/assertj/core/error/ShouldNotHaveDuplicates_create_Test.java b/src/test/java/org/assertj/core/error/ShouldNotHaveDuplicates_create_Test.java index 0eaffb0d93e..93878542511 100644 --- a/src/test/java/org/assertj/core/error/ShouldNotHaveDuplicates_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/assertj/core/error/ShouldNotStartWith_create_Test.java b/src/test/java/org/assertj/core/error/ShouldNotStartWith_create_Test.java index 0fad5bfee82..2396b76b1bf 100644 --- a/src/test/java/org/assertj/core/error/ShouldNotStartWith_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/assertj/core/error/ShouldStartWith_create_Test.java b/src/test/java/org/assertj/core/error/ShouldStartWith_create_Test.java index eb1424d6583..30bb8fb8b14 100644 --- a/src/test/java/org/assertj/core/error/ShouldStartWith_create_Test.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/assertj/core/internal/AbstractTest_ComparatorBasedComparisonStrategy.java b/src/test/java/org/assertj/core/internal/AbstractTest_ComparatorBasedComparisonStrategy.java index e5417dac6d5..277d7dec881 100644 --- a/src/test/java/org/assertj/core/internal/AbstractTest_ComparatorBasedComparisonStrategy.java +++ b/src/test/java/org/assertj/core/internal/AbstractTest_ComparatorBasedComparisonStrategy.java @@ -14,6 +14,8 @@ import java.util.Comparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; + public class AbstractTest_ComparatorBasedComparisonStrategy { protected Comparator caseInsensitiveStringComparator = CaseInsensitiveStringComparator.instance; diff --git a/src/test/java/org/assertj/core/internal/BaseArraysTest.java b/src/test/java/org/assertj/core/internal/BaseArraysTest.java index 09cd811848a..a9344e2538d 100644 --- a/src/test/java/org/assertj/core/internal/BaseArraysTest.java +++ b/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.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; public class BaseArraysTest { @@ -35,4 +35,4 @@ public void setUp() { arraysWithCustomComparisonStrategy = new Arrays(caseInsensitiveStringComparisonStrategy); } -} \ No newline at end of file +} diff --git a/src/test/java/org/assertj/core/internal/ComparatorBasedComparisonStrategy_isGreaterThan_Test.java b/src/test/java/org/assertj/core/internal/ComparatorBasedComparisonStrategy_isGreaterThan_Test.java index a59f41893f7..f9ce11c462e 100644 --- a/src/test/java/org/assertj/core/internal/ComparatorBasedComparisonStrategy_isGreaterThan_Test.java +++ b/src/test/java/org/assertj/core/internal/ComparatorBasedComparisonStrategy_isGreaterThan_Test.java @@ -19,6 +19,7 @@ import java.awt.*; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/assertj/core/internal/IterableDiff_Test.java b/src/test/java/org/assertj/core/internal/IterableDiff_Test.java index 8e3df84c207..1ceea1589fe 100644 --- a/src/test/java/org/assertj/core/internal/IterableDiff_Test.java +++ b/src/test/java/org/assertj/core/internal/IterableDiff_Test.java @@ -19,7 +19,7 @@ import java.util.List; -import org.assertj.core.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/assertj/core/internal/IterablesBaseTest.java b/src/test/java/org/assertj/core/internal/IterablesBaseTest.java index dcd2a964972..32d7b218323 100644 --- a/src/test/java/org/assertj/core/internal/IterablesBaseTest.java +++ b/src/test/java/org/assertj/core/internal/IterablesBaseTest.java @@ -19,7 +19,7 @@ import java.util.List; import org.assertj.core.api.AssertionInfo; -import org.assertj.core.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; /** @@ -56,4 +56,4 @@ public void setUp() { info = someInfo(); } -} \ No newline at end of file +} diff --git a/src/test/java/org/assertj/core/internal/ListsBaseTest.java b/src/test/java/org/assertj/core/internal/ListsBaseTest.java index 615947aa600..ff155046cea 100644 --- a/src/test/java/org/assertj/core/internal/ListsBaseTest.java +++ b/src/test/java/org/assertj/core/internal/ListsBaseTest.java @@ -14,7 +14,7 @@ import static org.mockito.Mockito.spy; -import org.assertj.core.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; /** @@ -44,4 +44,4 @@ public void setUp() { listsWithCaseInsensitiveComparisonStrategy.failures = failures; } -} \ No newline at end of file +} diff --git a/src/test/java/org/assertj/core/internal/ObjectArraysBaseTest.java b/src/test/java/org/assertj/core/internal/ObjectArraysBaseTest.java index 770c189052c..a9c454129a8 100644 --- a/src/test/java/org/assertj/core/internal/ObjectArraysBaseTest.java +++ b/src/test/java/org/assertj/core/internal/ObjectArraysBaseTest.java @@ -19,7 +19,7 @@ import java.util.Comparator; import org.assertj.core.api.AssertionInfo; -import org.assertj.core.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; @@ -74,4 +74,4 @@ protected void setArrays(Arrays internalArrays) { arrays.setArrays(internalArrays); } -} \ No newline at end of file +} diff --git a/src/test/java/org/assertj/core/internal/ObjectsBaseTest.java b/src/test/java/org/assertj/core/internal/ObjectsBaseTest.java index accc49a979d..61b7d630804 100644 --- a/src/test/java/org/assertj/core/internal/ObjectsBaseTest.java +++ b/src/test/java/org/assertj/core/internal/ObjectsBaseTest.java @@ -21,7 +21,7 @@ import org.assertj.core.api.AssertionInfo; import org.assertj.core.api.Assertions; -import org.assertj.core.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; /** diff --git a/src/test/java/org/assertj/core/internal/StringsBaseTest.java b/src/test/java/org/assertj/core/internal/StringsBaseTest.java index af08d5ee345..39773c809a1 100644 --- a/src/test/java/org/assertj/core/internal/StringsBaseTest.java +++ b/src/test/java/org/assertj/core/internal/StringsBaseTest.java @@ -16,7 +16,7 @@ import static org.mockito.Mockito.spy; import org.assertj.core.api.AssertionInfo; -import org.assertj.core.util.CaseInsensitiveStringComparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; import org.junit.jupiter.api.BeforeEach; /** diff --git a/src/test/java/org/assertj/core/util/CaseInsensitiveStringComparator.java b/src/test/java/org/assertj/core/test/CaseInsensitiveStringComparator.java similarity index 91% rename from src/test/java/org/assertj/core/util/CaseInsensitiveStringComparator.java rename to src/test/java/org/assertj/core/test/CaseInsensitiveStringComparator.java index 5476c088845..cf06da96ef4 100644 --- a/src/test/java/org/assertj/core/util/CaseInsensitiveStringComparator.java +++ b/src/test/java/org/assertj/core/test/CaseInsensitiveStringComparator.java @@ -10,7 +10,7 @@ * * Copyright 2012-2022 the original author or authors. */ -package org.assertj.core.util; +package org.assertj.core.test; import java.util.Comparator; @@ -23,6 +23,7 @@ public int compare(String s1, String s2) { if (s1 == null && s2 == null) return 0; if (s1 == null) return -1; if (s2 == null) return 1; - return s1.toLowerCase().compareTo(s2.toLowerCase()); + return String.CASE_INSENSITIVE_ORDER.compare(s1, s2); } -} \ No newline at end of file + +} diff --git a/src/test/java/org/assertj/core/internal/CaseInsensitiveStringComparator.java b/src/test/java/org/assertj/core/test/CaseInsensitiveStringComparatorTest.java similarity index 55% rename from src/test/java/org/assertj/core/internal/CaseInsensitiveStringComparator.java rename to src/test/java/org/assertj/core/test/CaseInsensitiveStringComparatorTest.java index dcaffa0a031..dec73d2e89f 100644 --- a/src/test/java/org/assertj/core/internal/CaseInsensitiveStringComparator.java +++ b/src/test/java/org/assertj/core/test/CaseInsensitiveStringComparatorTest.java @@ -10,18 +10,24 @@ * * Copyright 2012-2022 the original author or authors. */ -package org.assertj.core.internal; +package org.assertj.core.test; -import java.util.Comparator; +import static org.assertj.core.api.BDDAssertions.then; -public class CaseInsensitiveStringComparator implements Comparator { +import org.junit.jupiter.api.Test; +import org.junitpioneer.jupiter.DefaultLocale; - public final static CaseInsensitiveStringComparator instance = new CaseInsensitiveStringComparator(); +class CaseInsensitiveStringComparatorTest { - @Override - public int compare(String s1, String s2) { - if (s1 == null) return s2 == null ? 0 : 1; - if (s2 == null) return -1; - return s1.toLowerCase().compareTo(s2.toLowerCase()); + private final CaseInsensitiveStringComparator underTest = new CaseInsensitiveStringComparator(); + + @Test + @DefaultLocale("tr-TR") + void should_work_with_turkish_locale() { + // WHEN + int result = underTest.compare("i", "I"); + // THEN + then(result).isZero(); } -} \ No newline at end of file + +} diff --git a/src/test/java/org/assertj/core/util/CaseInsensitiveCharSequenceComparator.java b/src/test/java/org/assertj/core/util/CaseInsensitiveCharSequenceComparator.java index 68dfac3c169..f822bf85de9 100644 --- a/src/test/java/org/assertj/core/util/CaseInsensitiveCharSequenceComparator.java +++ b/src/test/java/org/assertj/core/util/CaseInsensitiveCharSequenceComparator.java @@ -14,6 +14,8 @@ import java.util.Comparator; +import org.assertj.core.test.CaseInsensitiveStringComparator; + /** * @author Mikhail Mazursky */