Skip to content

Commit 8547f86

Browse files
committed
Polish LocaleResolver tests
1 parent 40cb814 commit 8547f86

File tree

4 files changed

+86
-160
lines changed

4 files changed

+86
-160
lines changed

spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolverTests.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2019 the original author or authors.
2+
* Copyright 2002-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -43,49 +43,49 @@
4343
* @author Rossen Stoyanchev
4444
* @author Juergen Hoeller
4545
*/
46-
public class AcceptHeaderLocaleResolverTests {
46+
class AcceptHeaderLocaleResolverTests {
4747

4848
private final AcceptHeaderLocaleResolver resolver = new AcceptHeaderLocaleResolver();
4949

5050

5151
@Test
52-
public void resolve() {
52+
void resolve() {
5353
assertThat(this.resolver.resolveLocale(request(CANADA))).isEqualTo(CANADA);
5454
assertThat(this.resolver.resolveLocale(request(US, CANADA))).isEqualTo(US);
5555
}
5656

5757
@Test
58-
public void resolvePreferredSupported() {
58+
void resolvePreferredSupported() {
5959
this.resolver.setSupportedLocales(Collections.singletonList(CANADA));
6060
assertThat(this.resolver.resolveLocale(request(US, CANADA))).isEqualTo(CANADA);
6161
}
6262

6363
@Test
64-
public void resolvePreferredNotSupported() {
64+
void resolvePreferredNotSupported() {
6565
this.resolver.setSupportedLocales(Collections.singletonList(CANADA));
6666
assertThat(this.resolver.resolveLocale(request(US, UK))).isEqualTo(US);
6767
}
6868

6969
@Test
70-
public void resolvePreferredAgainstLanguageOnly() {
70+
void resolvePreferredAgainstLanguageOnly() {
7171
this.resolver.setSupportedLocales(Collections.singletonList(ENGLISH));
7272
assertThat(this.resolver.resolveLocale(request(GERMANY, US, UK))).isEqualTo(ENGLISH);
7373
}
7474

7575
@Test
76-
public void resolvePreferredAgainstCountryIfPossible() {
76+
void resolvePreferredAgainstCountryIfPossible() {
7777
this.resolver.setSupportedLocales(Arrays.asList(ENGLISH, UK));
7878
assertThat(this.resolver.resolveLocale(request(GERMANY, US, UK))).isEqualTo(UK);
7979
}
8080

8181
@Test
82-
public void resolvePreferredAgainstLanguageWithMultipleSupportedLocales() {
82+
void resolvePreferredAgainstLanguageWithMultipleSupportedLocales() {
8383
this.resolver.setSupportedLocales(Arrays.asList(GERMAN, US));
8484
assertThat(this.resolver.resolveLocale(request(GERMANY, US, UK))).isEqualTo(GERMAN);
8585
}
8686

8787
@Test
88-
public void resolvePreferredNotSupportedWithDefault() {
88+
void resolvePreferredNotSupportedWithDefault() {
8989
this.resolver.setSupportedLocales(Arrays.asList(US, JAPAN));
9090
this.resolver.setDefaultLocale(Locale.JAPAN);
9191

@@ -96,7 +96,7 @@ public void resolvePreferredNotSupportedWithDefault() {
9696
}
9797

9898
@Test
99-
public void defaultLocale() {
99+
void defaultLocale() {
100100
this.resolver.setDefaultLocale(JAPANESE);
101101
MockHttpServletRequest request = new MockHttpServletRequest();
102102
assertThat(this.resolver.resolveLocale(request)).isEqualTo(JAPANESE);

0 commit comments

Comments
 (0)