[struts] 01/04: [WW-4977] Fixing flaky test in Jsr168DispatcherTest and Jsr286DispatcherTest.

[yasserzamani]

This is an automated email from the ASF dual-hosted git repository.

yasserzamani pushed a commit to branch struts-2-5-x
in repository https://gitbox.apache.org/repos/asf/struts.git

commit d7a7c909ea26aa657b969de08d68ba046468df11
Author: ORDTesters <ordtest...@gmail.com>
AuthorDate: Mon Nov 12 07:18:42 2018 +0330

    [WW-4977] Fixing flaky test in Jsr168DispatcherTest and 
Jsr286DispatcherTest.
    
    (cherry picked from commit 2d4e26f)
---
 .../java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java | 1 +
 .../java/org/apache/struts2/portlet/dispatcher/Jsr286DispatcherTest.java | 1 +
 2 files changed, 2 insertions(+)

diff --git 
a/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java
 
b/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java
index ef0c5c0..be2ea35 100644
--- 
a/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java
+++ 
b/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java
@@ -261,6 +261,7 @@ public class Jsr168DispatcherTest extends 
MockObjectTestCase {
         Map<String, String> initParams = new HashMap<String, String>();
         initParams.put("viewNamespace", "/view");
         initParams.put("editNamespace", "/edit");
+        initParams.put(StrutsConstants.STRUTS_ALWAYS_SELECT_FULL_NAMESPACE, 
"true");
 
         initPortletConfig(initParams, new HashMap<String, Object>());
         initRequest(requestParams, new HashMap<String, Object>(), sessionMap, 
mode, WindowState.NORMAL, false, null);
diff --git 
a/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr286DispatcherTest.java
 
b/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr286DispatcherTest.java
index 6d8ff4b..c5f4346 100644
--- 
a/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr286DispatcherTest.java
+++ 
b/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr286DispatcherTest.java
@@ -142,6 +142,7 @@ public class Jsr286DispatcherTest extends 
MockObjectTestCase {
                Map<String, String> initParams = new HashMap<String, String>();
                initParams.put("viewNamespace", "/view");
                initParams.put("editNamespace", "/edit");
+               
initParams.put(StrutsConstants.STRUTS_ALWAYS_SELECT_FULL_NAMESPACE, "true");
 
                initPortletConfig(initParams, new HashMap<String, Object>());
                initRequest(requestParams, new HashMap<String, Object>(), 
sessionMap,