[jspwiki] 12/32: fix TestEngine so it uses a "3.1" compatible servlet context

[ju...@apache.org]

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

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit c41fa091fc7799e62584a1bbca1cf2b8ed1389cf
Author: juanpablo <ju...@apache.org>
AuthorDate: Mon Jan 20 21:38:24 2020 +0100

    fix TestEngine so it uses a "3.1" compatible servlet context
    
    (it's a bit of a kludge, but enough right now)
---
 .../src/test/java/org/apache/wiki/TestEngine.java  | 17 +++++++++++++-
 .../test/java/org/apache/wiki/WikiServletTest.java | 26 ++++++++++------------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java b/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
index f97fa6e..7178bdd 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
@@ -135,13 +135,28 @@ public class TestEngine extends WikiEngine
     }
 
     public TestEngine( Properties props ) throws WikiException {
-        super( new MockServletContext( "test" ), "test", cleanTestProps( props ) );
+        super( createServletContext( "test" ), "test", cleanTestProps( props ) );
 
         // Stash the WikiEngine in the servlet context
         ServletContext servletContext = this.getServletContext();
         servletContext.setAttribute("org.apache.wiki.WikiEngine", this);
     }
 
+    public static MockServletContext createServletContext( final String contextName ) {
+        return new MockServletContext( contextName ) {
+
+            @Override
+            public int getMajorVersion() {
+                return 3;
+            }
+
+            @Override
+            public int getMinorVersion() {
+                return 1;
+            }
+        };
+    }
+
     /**
      * Creates a correctly-instantiated mock HttpServletRequest with an associated
      * HttpSession.
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/WikiServletTest.java b/jspwiki-main/src/test/java/org/apache/wiki/WikiServletTest.java
index d4d67b3..6b783b0 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/WikiServletTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/WikiServletTest.java
@@ -18,24 +18,22 @@
  */
 package org.apache.wiki;
 
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
 import net.sourceforge.stripes.mock.MockHttpServletRequest;
 import net.sourceforge.stripes.mock.MockHttpServletResponse;
 import net.sourceforge.stripes.mock.MockServletConfig;
-import net.sourceforge.stripes.mock.MockServletContext;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 
 public class WikiServletTest {
     
     @Test
     public void testDoGet() throws Exception {
-        MockHttpServletRequest req = new MockHttpServletRequest( "/JSPWiki", "/wiki/Wiki.jsp" );
-        MockHttpServletResponse res = new MockHttpServletResponse();
-        WikiServlet wikiServlet = new WikiServlet();
-        MockServletConfig config = new MockServletConfig();
-        config.setServletContext( new MockServletContext( "/JSPWiki" ) );
+        final MockHttpServletRequest req = new MockHttpServletRequest( "/JSPWiki", "/wiki/Wiki.jsp" );
+        final MockHttpServletResponse res = new MockHttpServletResponse();
+        final WikiServlet wikiServlet = new WikiServlet();
+        final MockServletConfig config = new MockServletConfig();
+        config.setServletContext( TestEngine.createServletContext( "/JSPWiki" ) );
         
         wikiServlet.init( config );
         wikiServlet.doGet( req, res );
@@ -46,11 +44,11 @@ public class WikiServletTest {
     
     @Test
     public void testNastyDoPost() throws Exception {
-        MockHttpServletRequest req = new MockHttpServletRequest( "/JSPWiki", "/wiki/Edit.jsp" );
-        MockHttpServletResponse res = new MockHttpServletResponse();
-        WikiServlet wikiServlet = new WikiServlet();
-        MockServletConfig config = new MockServletConfig();
-        config.setServletContext( new MockServletContext( "/JSPWiki" ) );
+        final MockHttpServletRequest req = new MockHttpServletRequest( "/JSPWiki", "/wiki/Edit.jsp" );
+        final MockHttpServletResponse res = new MockHttpServletResponse();
+        final WikiServlet wikiServlet = new WikiServlet();
+        final MockServletConfig config = new MockServletConfig();
+        config.setServletContext( TestEngine.createServletContext( "/JSPWiki" ) );
         
         wikiServlet.init( config );
         wikiServlet.doPost( req, res );