From caeea2145f3e9e834e9854b2b160c2c3cf0da609 Mon Sep 17 00:00:00 2001 From: Yasser Zamani Date: Wed, 31 Jan 2018 13:57:21 +0330 Subject: [PATCH] test not create when no session See also WW-4741 --- .../struts2/interceptor/I18nInterceptorTest.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java index f31f96c3f..fcc0dd11b 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java @@ -61,9 +61,10 @@ public class I18nInterceptorTest extends TestCase { fail("Shouldn't throw any exception!"); } - assertFalse(mai.getInvocationContext().getParameters().get(I18nInterceptor.DEFAULT_PARAMETER).isDefined()); // should have been removed - - assertNull(session.get(I18nInterceptor.DEFAULT_SESSION_ATTRIBUTE)); // should not be stored here + assertFalse("should have been removed", + mai.getInvocationContext().getParameters().get(I18nInterceptor.DEFAULT_PARAMETER).isDefined()); + assertNull("should not be created", request.getSession(false)); + assertNull("should not be stored here", session.get(I18nInterceptor.DEFAULT_SESSION_ATTRIBUTE)); } public void testNoSessionButLocale() throws Exception { @@ -76,9 +77,10 @@ public class I18nInterceptorTest extends TestCase { fail("Shouldn't throw any exception!"); } - assertFalse(mai.getInvocationContext().getParameters().get(I18nInterceptor.DEFAULT_PARAMETER).isDefined()); // should have been removed - - assertNull(session.get(I18nInterceptor.DEFAULT_SESSION_ATTRIBUTE)); // should not be stored here + assertFalse("should have been removed", + mai.getInvocationContext().getParameters().get(I18nInterceptor.DEFAULT_PARAMETER).isDefined()); + assertNull("should not be created", request.getSession(false)); + assertNull("should not be stored here", session.get(I18nInterceptor.DEFAULT_SESSION_ATTRIBUTE)); } public void testDefaultLocale() throws Exception {