Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish: assertion arguments should be passed in the correct order,

Browse Source 
use assertNull instead of assertEquals(null, value),
declare delta as double value in assertEquals
This commit is contained in:
igor-suhorukov
2018-02-10 15:41:55 +03:00
committed by Juergen Hoeller
parent 39201adca4
commit 0ee505b73e
36 changed files with 142 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/CookieLocaleResolverTests.java
View File

@@ -49,7 +49,7 @@ public class CookieLocaleResolverTests {
CookieLocaleResolver resolver = new CookieLocaleResolver();
resolver.setCookieName("LanguageKoekje");
Locale loc = resolver.resolveLocale(request);
assertEquals(loc.getLanguage(), "nl");
assertEquals("nl", loc.getLanguage());
}
@Test

16
spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/LocaleResolverTests.java
View File

@@ -68,7 +68,7 @@ public class LocaleResolverTests {
// check original locale
Locale locale = localeResolver.resolveLocale(request);
assertEquals(locale, Locale.UK);
assertEquals(Locale.UK, locale);
// set new locale
try {
localeResolver.setLocale(request, response, Locale.GERMANY);
@@ -76,7 +76,7 @@ public class LocaleResolverTests {
fail("should not be able to set Locale");
// check new locale
locale = localeResolver.resolveLocale(request);
assertEquals(locale, Locale.GERMANY);
assertEquals(Locale.GERMANY, locale);
}
catch (UnsupportedOperationException ex) {
if (shouldSet) {
@@ -89,10 +89,10 @@ public class LocaleResolverTests {
LocaleContextResolver localeContextResolver = (LocaleContextResolver) localeResolver;
LocaleContext localeContext = localeContextResolver.resolveLocaleContext(request);
if (shouldSet) {
assertEquals(localeContext.getLocale(), Locale.GERMANY);
assertEquals(Locale.GERMANY, localeContext.getLocale());
}
else {
assertEquals(localeContext.getLocale(), Locale.UK);
assertEquals(Locale.UK, localeContext.getLocale());
}
assertTrue(localeContext instanceof TimeZoneAwareLocaleContext);
assertNull(((TimeZoneAwareLocaleContext) localeContext).getTimeZone());
@@ -108,7 +108,7 @@ public class LocaleResolverTests {
fail("should not be able to set Locale");
}
localeContext = localeContextResolver.resolveLocaleContext(request);
assertEquals(localeContext.getLocale(), Locale.US);
assertEquals(Locale.US, localeContext.getLocale());
if (localeContextResolver instanceof AbstractLocaleContextResolver) {
assertEquals(((TimeZoneAwareLocaleContext) localeContext).getTimeZone(), TimeZone.getTimeZone("GMT+1"));
}
@@ -119,20 +119,20 @@ public class LocaleResolverTests {
localeContextResolver.setLocaleContext(request, response,
new SimpleTimeZoneAwareLocaleContext(Locale.GERMANY, TimeZone.getTimeZone("GMT+2")));
localeContext = localeContextResolver.resolveLocaleContext(request);
assertEquals(localeContext.getLocale(), Locale.GERMANY);
assertEquals(Locale.GERMANY, localeContext.getLocale());
assertTrue(localeContext instanceof TimeZoneAwareLocaleContext);
assertEquals(((TimeZoneAwareLocaleContext) localeContext).getTimeZone(), TimeZone.getTimeZone("GMT+2"));
localeContextResolver.setLocaleContext(request, response,
new SimpleTimeZoneAwareLocaleContext(null, TimeZone.getTimeZone("GMT+3")));
localeContext = localeContextResolver.resolveLocaleContext(request);
assertEquals(localeContext.getLocale(), Locale.UK);
assertEquals(Locale.UK, localeContext.getLocale());
assertTrue(localeContext instanceof TimeZoneAwareLocaleContext);
assertEquals(((TimeZoneAwareLocaleContext) localeContext).getTimeZone(), TimeZone.getTimeZone("GMT+3"));
if (localeContextResolver instanceof AbstractLocaleContextResolver) {
((AbstractLocaleContextResolver) localeContextResolver).setDefaultLocale(Locale.GERMANY);
assertEquals(localeContext.getLocale(), Locale.GERMANY);
assertEquals(Locale.GERMANY, localeContext.getLocale());
}
}
catch (UnsupportedOperationException ex) {

6
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
View File

@@ -195,7 +195,7 @@ public class BindTagTests extends AbstractTagTests {
tag.doStartTag();
BindStatus status = (BindStatus) pc.getAttribute(BindTag.STATUS_VARIABLE_NAME, PageContext.REQUEST_SCOPE);
assertEquals("Error messages String should be 'message1'",
status.getErrorMessagesAsString(","), "message1");
"message1", status.getErrorMessagesAsString(","));
// two errors
pc = createPageContext();
@@ -209,7 +209,7 @@ public class BindTagTests extends AbstractTagTests {
tag.doStartTag();
status = (BindStatus) pc.getAttribute(BindTag.STATUS_VARIABLE_NAME, PageContext.REQUEST_SCOPE);
assertEquals("Error messages String should be 'message1,message2'",
status.getErrorMessagesAsString(","), "message1,message2");
"message1,message2", status.getErrorMessagesAsString(","));
// no errors
pc = createPageContext();
@@ -220,7 +220,7 @@ public class BindTagTests extends AbstractTagTests {
tag.setPath("tb");
tag.doStartTag();
status = (BindStatus) pc.getAttribute(BindTag.STATUS_VARIABLE_NAME, PageContext.REQUEST_SCOPE);
assertEquals("Error messages String should be ''", status.getErrorMessagesAsString(","), "");
assertEquals("Error messages String should be ''", "", status.getErrorMessagesAsString(","));
}
@Test