Skip to content

Commit ec9bc6b

Browse files
authored
Merge pull request #277 from mP1/feature/mP1-walkingkooka-pull-2773-SortedSets-N-ImmutableSortedSet
mP1/walkingkooka#2773 SortedSets & ImmutableS…
2 parents 0c5f492 + 1a34c44 commit ec9bc6b

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/test/java/walkingkooka/j2cl/java/text/DateFormatSymbolsTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.junit.jupiter.api.Test;
2222
import walkingkooka.HashCodeEqualsDefinedTesting2;
2323
import walkingkooka.ToStringTesting;
24-
import walkingkooka.collect.set.Sets;
24+
import walkingkooka.collect.set.SortedSets;
2525
import walkingkooka.j2cl.locale.WalkingkookaLanguageTag;
2626
import walkingkooka.predicate.Predicates;
2727

@@ -46,7 +46,7 @@ public final class DateFormatSymbolsTest extends JavaTextTestCase<DateFormatSymb
4646
public void testGetAvailableLocales() {
4747
final Comparator<Locale> comparator = (l, r) -> l.toLanguageTag().compareTo(r.toLanguageTag());
4848

49-
final Set<Locale> jdk = Sets.sorted(comparator);
49+
final Set<Locale> jdk = SortedSets.tree(comparator);
5050
for(final Locale locale : java.text.DateFormatSymbols.getAvailableLocales()) {
5151
switch(locale.toString()) {
5252
case "th_TH_TH_#u-nu-thai":
@@ -58,7 +58,7 @@ public void testGetAvailableLocales() {
5858
}
5959
}
6060

61-
final Set<Locale> emulated = Sets.sorted(comparator);
61+
final Set<Locale> emulated = SortedSets.tree(comparator);
6262
emulated.addAll(Arrays.asList(DateFormatSymbols.getAvailableLocales()));
6363

6464
this.checkEquals(jdk, emulated);

src/test/java/walkingkooka/j2cl/java/text/DecimalFormatSymbolsTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.junit.jupiter.api.Test;
2222
import walkingkooka.HashCodeEqualsDefinedTesting2;
2323
import walkingkooka.ToStringTesting;
24-
import walkingkooka.collect.set.Sets;
24+
import walkingkooka.collect.set.SortedSets;
2525
import walkingkooka.j2cl.java.io.string.StringDataInputDataOutput;
2626
import walkingkooka.j2cl.java.text.generated.DateFormatSymbolsProvider;
2727
import walkingkooka.j2cl.locale.WalkingkookaLanguageTag;
@@ -66,7 +66,7 @@ public void testRegisterThenDataInputThrowsEOF() throws Exception {
6666
public void testGetAvailableLocales() {
6767
final Comparator<Locale> comparator = (l, r) -> l.toLanguageTag().compareTo(r.toLanguageTag());
6868

69-
final Set<Locale> jdk = Sets.sorted(comparator);
69+
final Set<Locale> jdk = SortedSets.tree(comparator);
7070
for (final Locale locale : java.text.DateFormatSymbols.getAvailableLocales()) {
7171
switch (locale.toString()) {
7272
case "th_TH_TH_#u-nu-thai":
@@ -78,7 +78,7 @@ public void testGetAvailableLocales() {
7878
}
7979
}
8080

81-
final Set<Locale> emulated = Sets.sorted(comparator);
81+
final Set<Locale> emulated = SortedSets.tree(comparator);
8282
emulated.addAll(Arrays.asList(DecimalFormatSymbols.getAvailableLocales()));
8383

8484
this.checkEquals(jdk, emulated);

src/test/java/walkingkooka/j2cl/java/text/NumberFormatTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package walkingkooka.j2cl.java.text;
1919

2020
import org.junit.jupiter.api.Test;
21-
import walkingkooka.collect.set.Sets;
21+
import walkingkooka.collect.set.SortedSets;
2222

2323
import java.lang.reflect.Field;
2424
import java.lang.reflect.Method;
@@ -54,7 +54,7 @@ public void testIntegerField() {
5454
public void testGetAvailableLocales() {
5555
final Comparator<Locale> comparator = (l, r) -> l.toLanguageTag().compareTo(r.toLanguageTag());
5656

57-
final Set<Locale> jdk = Sets.sorted(comparator);
57+
final Set<Locale> jdk = SortedSets.tree(comparator);
5858
for(final Locale locale : java.text.DateFormatSymbols.getAvailableLocales()) {
5959
switch(locale.toString()) {
6060
case "th_TH_TH_#u-nu-thai":
@@ -66,7 +66,7 @@ public void testGetAvailableLocales() {
6666
}
6767
}
6868

69-
final Set<Locale> emulated = Sets.sorted(comparator);
69+
final Set<Locale> emulated = SortedSets.tree(comparator);
7070
emulated.addAll(Arrays.asList(NumberFormat.getAvailableLocales()));
7171

7272
this.checkEquals(jdk, emulated);

0 commit comments

Comments
 (0)