Author: tv
Date: Tue Aug 2 12:55:35 2016
New Revision: 1754909
URL: http://svn.apache.org/viewvc?rev=1754909&view=rev
Log:
Replace mockobjects with Mockito
Removed:
turbine/core/trunk/src/test/org/apache/turbine/test/EnhancedMockHttpServletRequest.java
turbine/core/trunk/src/test/org/apache/turbine/test/EnhancedMockHttpServletResponse.java
turbine/core/trunk/src/test/org/apache/turbine/test/EnhancedMockHttpSession.java
Modified:
turbine/core/trunk/pom.xml
turbine/core/trunk/src/changes/changes.xml
turbine/core/trunk/src/test/org/apache/turbine/TurbineTest.java
turbine/core/trunk/src/test/org/apache/turbine/modules/ActionLoaderTest.java
turbine/core/trunk/src/test/org/apache/turbine/modules/LayoutLoaderTest.java
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultACLCreationValveTest.java
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultLoginValveTest.java
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionValidationValveTest.java
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DetermineActionValveTest.java
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DetermineTargetValveTest.java
turbine/core/trunk/src/test/org/apache/turbine/pipeline/ExecutePageValveTest.java
turbine/core/trunk/src/test/org/apache/turbine/services/intake/IntakeToolTest.java
turbine/core/trunk/src/test/org/apache/turbine/services/localization/LocalizationToolTest.java
turbine/core/trunk/src/test/org/apache/turbine/test/BaseTestCase.java
Modified: turbine/core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1754909&r1=1754908&r2=1754909&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Tue Aug 2 12:55:35 2016
@@ -988,7 +988,7 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.10</version>
@@ -1039,15 +1039,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>mockobjects</groupId>
- <artifactId>mockobjects-jdk1.4-j2ee1.3</artifactId>
- <version>0.09</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>mockobjects</groupId>
- <artifactId>mockobjects-core</artifactId>
- <version>0.09</version>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>2.0.2-beta</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: turbine/core/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/changes/changes.xml?rev=1754909&r1=1754908&r2=1754909&view=diff
==============================================================================
--- turbine/core/trunk/src/changes/changes.xml (original)
+++ turbine/core/trunk/src/changes/changes.xml Tue Aug 2 12:55:35 2016
@@ -25,6 +25,9 @@
<body>
<release version="4.0" date="in Subversion">
+ <action type="update" dev="tv">
+ Replace mockobjects with Mockito
+ </action>
<action type="fix" dev="tv">
Fix NPE in LogoutAction: draw user from session instead of RunData.
Add test.
</action>
Modified: turbine/core/trunk/src/test/org/apache/turbine/TurbineTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/TurbineTest.java?rev=1754909&r1=1754908&r2=1754909&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/TurbineTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/TurbineTest.java Tue Aug 2
12:55:35 2016
@@ -22,12 +22,13 @@ package org.apache.turbine;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.turbine.test.BaseTestCase;
-import org.apache.turbine.test.EnhancedMockHttpServletResponse;
import org.apache.turbine.util.TurbineConfig;
import org.junit.Test;
-
-import com.mockobjects.servlet.MockHttpServletRequest;
+import org.mockito.Mockito;
/**
* This testcase verifies that TurbineConfig can be used to startup Turbine in
a
@@ -53,8 +54,8 @@ public class TurbineTest extends BaseTes
assertEquals("", Turbine.getScriptName());
Turbine t = tc.getTurbine();
- MockHttpServletRequest request = getMockRequest();
- EnhancedMockHttpServletResponse resp = new
EnhancedMockHttpServletResponse();
+ HttpServletRequest request = getMockRequest();
+ HttpServletResponse resp = Mockito.mock(HttpServletResponse.class);
t.doGet(request, resp);
@@ -62,6 +63,7 @@ public class TurbineTest extends BaseTes
t.destroy();
tc.dispose();
}
+
@Test
public void testDefaultInputEncoding() throws Exception
{
@@ -74,6 +76,7 @@ public class TurbineTest extends BaseTes
t.destroy();
tc.dispose();
}
+
@Test
public void testNonDefaultEncoding()
{
Modified:
turbine/core/trunk/src/test/org/apache/turbine/modules/ActionLoaderTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/modules/ActionLoaderTest.java?rev=1754909&r1=1754908&r2=1754909&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/modules/ActionLoaderTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/modules/ActionLoaderTest.java
Tue Aug 2 12:55:35 2016
@@ -23,21 +23,21 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.util.HashMap;
import java.util.Map;
-import java.util.Vector;
+import javax.servlet.ServletConfig;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.turbine.Turbine;
import org.apache.turbine.modules.actions.VelocityActionDoesNothing;
-import org.apache.turbine.om.security.User;
import org.apache.turbine.pipeline.DefaultPipelineData;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.test.BaseTestCase;
-import org.apache.turbine.test.EnhancedMockHttpServletRequest;
-import org.apache.turbine.test.EnhancedMockHttpSession;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
import org.junit.AfterClass;
@@ -45,9 +45,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import com.mockobjects.servlet.MockHttpServletResponse;
-import com.mockobjects.servlet.MockServletConfig;
-
/**
* This test case is to verify whether exceptions in Velocity actions are
* properly bubbled up when action.event.bubbleexception=true. Or, if
@@ -62,9 +59,8 @@ import com.mockobjects.servlet.MockServl
public class ActionLoaderTest extends BaseTestCase
{
private static TurbineConfig tc = null;
- private MockServletConfig config = null;
- private EnhancedMockHttpServletRequest request = null;
- private EnhancedMockHttpSession session = null;
+ private ServletConfig config = null;
+ private HttpServletRequest request = null;
private HttpServletResponse response = null;
/*
@@ -72,7 +68,8 @@ public class ActionLoaderTest extends Ba
*/
@BeforeClass
- public static void init() {
+ public static void init()
+ {
tc = new TurbineConfig(".",
"/conf/test/CompleteTurbineResources.properties");
tc.initialize();
}
@@ -80,24 +77,9 @@ public class ActionLoaderTest extends Ba
@Before
public void setUpBefore() throws Exception
{
- config = new MockServletConfig();
- config.setupNoParameters();
- request = new EnhancedMockHttpServletRequest();
- request.setupServerName("bob");
- request.setupGetProtocol("http");
- request.setupScheme("scheme");
- request.setupPathInfo("damn");
- request.setupGetServletPath("damn2");
- request.setupGetContextPath("wow");
- request.setupGetContentType("html/text");
- request.setupAddHeader("Content-type", "html/text");
- request.setupAddHeader("Accept-Language", "en-US");
- Vector<String> v = new Vector<String>();
- request.setupGetParameterNames(v.elements());
- session = new EnhancedMockHttpSession();
- response = new MockHttpServletResponse();
- session.setupGetAttribute(User.SESSION_KEY, null);
- request.setSession(session);
+ config = mock(ServletConfig.class);
+ request = getMockRequest();
+ response = mock(HttpServletResponse.class);
}
/*
@@ -124,7 +106,6 @@ public class ActionLoaderTest extends Ba
public void testDoPerformBubblesException() throws Exception
{
System.out.println("tcturbine:"+ tc.getTurbine());
-
}
/**
@@ -138,9 +119,7 @@ public class ActionLoaderTest extends Ba
@Test
public void testActionEventBubblesException() throws Exception
{
- // can't seem to figure out how to setup the Mock Request with the
right
- // parameters...
- request.setupAddParameter("eventSubmit_doCauseexception", "foo");
+
when(request.getParameterValues("eventSubmit_doCauseexception")).thenReturn(new
String[] { "foo" });
RunData data = getRunData(request, response, config);
PipelineData pipelineData = new DefaultPipelineData();
Map<Class<?>, Object> runDataMap = new HashMap<Class<?>, Object>();
@@ -220,7 +199,7 @@ public class ActionLoaderTest extends Ba
// can't seem to figure out how to setup the Mock Request with the
right
// parameters...
Turbine.getConfiguration().setProperty("action.event.bubbleexception",
Boolean.FALSE);
- request.setupAddParameter("eventSubmit_doCauseexception", "foo");
+
when(request.getParameterValues("eventSubmit_doCauseexception")).thenReturn(new
String[] { "foo" });
RunData data = getRunData(request, response, config);
PipelineData pipelineData = new DefaultPipelineData();
Map<Class<?>, Object> runDataMap = new HashMap<Class<?>, Object>();
@@ -258,9 +237,7 @@ public class ActionLoaderTest extends Ba
@Test
public void testActionEventAnnotation() throws Exception
{
- // can't seem to figure out how to setup the Mock Request with the
right
- // parameters...
- request.setupAddParameter("eventSubmit_annotatedEvent", "foo");
+
when(request.getParameterValues("eventSubmit_annotatedEvent")).thenReturn(new
String[] { "foo" });
RunData data = getRunData(request, response, config);
PipelineData pipelineData = data;
data.setAction("VelocityActionDoesNothing");
Modified:
turbine/core/trunk/src/test/org/apache/turbine/modules/LayoutLoaderTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/modules/LayoutLoaderTest.java?rev=1754909&r1=1754908&r2=1754909&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/modules/LayoutLoaderTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/modules/LayoutLoaderTest.java
Tue Aug 2 12:55:35 2016
@@ -19,18 +19,17 @@
package org.apache.turbine.modules;
-import java.util.Vector;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import javax.servlet.ServletConfig;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import static org.junit.Assert.*;
-
import org.apache.turbine.modules.layouts.TestVelocityOnlyLayout;
-import org.apache.turbine.om.security.User;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.test.BaseTestCase;
-import org.apache.turbine.test.EnhancedMockHttpServletRequest;
-import org.apache.turbine.test.EnhancedMockHttpSession;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
import org.junit.AfterClass;
@@ -38,104 +37,95 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import com.mockobjects.servlet.MockHttpServletResponse;
-import com.mockobjects.servlet.MockServletConfig;
-
-
/**
* @author <a href="mailto:[email protected]";>Peter Courcoux</a>
*/
-public class LayoutLoaderTest extends BaseTestCase {
- private static TurbineConfig tc = null;
- private MockServletConfig config = null;
- private EnhancedMockHttpServletRequest request = null;
- private EnhancedMockHttpSession session = null;
- private HttpServletResponse response = null;
+public class LayoutLoaderTest extends BaseTestCase
+{
+ private static TurbineConfig tc = null;
+ private ServletConfig config = null;
+ private HttpServletRequest request = null;
+ private HttpServletResponse response = null;
@BeforeClass
- public static void init() {
+ public static void init()
+ {
tc = new TurbineConfig(
- ".",
- "/conf/test/CompleteTurbineResources.properties");
+ ".",
+ "/conf/test/CompleteTurbineResources.properties");
tc.initialize();
}
- @Before
- public void setUpBefore() throws Exception {
- config = new MockServletConfig();
- config.setupNoParameters();
- request = new EnhancedMockHttpServletRequest();
- request.setupServerName("bob");
- request.setupGetProtocol("http");
- request.setupScheme("scheme");
- request.setupPathInfo("damn");
- request.setupGetServletPath("damn2");
- request.setupGetContextPath("wow");
- request.setupGetContentType("html/text");
- request.setupAddHeader("Content-type", "html/text");
- request.setupAddHeader("Accept-Language", "en-US");
- Vector<String> v = new Vector<String>();
- request.setupGetParameterNames(v.elements());
- session = new EnhancedMockHttpSession();
- response = new MockHttpServletResponse();
- session.setupGetAttribute(User.SESSION_KEY, null);
- request.setSession(session);
-
- }
-
- /*
- * @see TestCase#tearDown()
- */
- @AfterClass
- public static void tearDown() throws Exception {
- if (tc != null) {
- tc.dispose();
- }
- }
-
- @Test
- public void testPipelineDataContainsRunData()
- {
- try
- {
- RunData data = getRunData(request,response,config);
+ @Before
+ public void setUpBefore() throws Exception
+ {
+ config = mock(ServletConfig.class);
+ request = getMockRequest();
+ response = mock(HttpServletResponse.class);
+ }
+
+ /*
+ * @see TestCase#tearDown()
+ */
+ @AfterClass
+ public static void tearDown() throws Exception
+ {
+ if (tc != null)
+ {
+ tc.dispose();
+ }
+ }
+
+ @Test
+ public void testPipelineDataContainsRunData()
+ {
+ try
+ {
+ RunData data = getRunData(request, response, config);
PipelineData pipelineData = data;
- data.setLayout("TestVelocityOnlyLayout");
- int numberOfCalls =
TestVelocityOnlyLayout.numberOfCalls;
- try {
- LayoutLoader.getInstance().exec(pipelineData,
data.getLayout());
- } catch (Exception e) {
- e.printStackTrace();
- fail("Should not have thrown an exception.");
- }
-
assertEquals(numberOfCalls+1,TestVelocityOnlyLayout.numberOfCalls);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- fail("Should not have thrown an exception.");
- }
- }
- @Test
- public void testDoBuildWithRunData()
- {
- try
- {
- RunData data = getRunData(request,response,config);
- data.setLayout("TestVelocityOnlyLayout");
- int numberOfCalls =
TestVelocityOnlyLayout.numberOfCalls;
- try {
- LayoutLoader.getInstance().exec(data,
data.getLayout());
- } catch (Exception e) {
- e.printStackTrace();
- fail("Should not have thrown an exception.");
- }
-
assertEquals(numberOfCalls+1,TestVelocityOnlyLayout.numberOfCalls);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- fail("Should not have thrown an exception.");
- }
- }
+ data.setLayout("TestVelocityOnlyLayout");
+ int numberOfCalls = TestVelocityOnlyLayout.numberOfCalls;
+ try
+ {
+ LayoutLoader.getInstance().exec(pipelineData,
data.getLayout());
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ fail("Should not have thrown an exception.");
+ }
+ assertEquals(numberOfCalls + 1,
TestVelocityOnlyLayout.numberOfCalls);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ fail("Should not have thrown an exception.");
+ }
+ }
+
+ @Test
+ public void testDoBuildWithRunData()
+ {
+ try
+ {
+ RunData data = getRunData(request, response, config);
+ data.setLayout("TestVelocityOnlyLayout");
+ int numberOfCalls = TestVelocityOnlyLayout.numberOfCalls;
+ try
+ {
+ LayoutLoader.getInstance().exec(data, data.getLayout());
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ fail("Should not have thrown an exception.");
+ }
+ assertEquals(numberOfCalls + 1,
TestVelocityOnlyLayout.numberOfCalls);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ fail("Should not have thrown an exception.");
+ }
+ }
}
Modified:
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultACLCreationValveTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultACLCreationValveTest.java?rev=1754909&r1=1754908&r2=1754909&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultACLCreationValveTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultACLCreationValveTest.java
Tue Aug 2 12:55:35 2016
@@ -22,14 +22,19 @@ package org.apache.turbine.pipeline;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.fulcrum.security.model.turbine.entity.impl.TurbineUserImpl;
import org.apache.turbine.om.security.DefaultUserImpl;
import org.apache.turbine.om.security.User;
import org.apache.turbine.test.BaseTestCase;
-import org.apache.turbine.test.EnhancedMockHttpServletRequest;
-import org.apache.turbine.test.EnhancedMockHttpSession;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
import org.junit.AfterClass;
@@ -37,11 +42,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import com.mockobjects.servlet.MockHttpServletResponse;
-import com.mockobjects.servlet.MockServletConfig;
-
-import static org.junit.Assert.*;
-
/**
* Tests TurbinePipeline.
*
@@ -52,14 +52,13 @@ import static org.junit.Assert.*;
public class DefaultACLCreationValveTest extends BaseTestCase
{
private static TurbineConfig tc = null;
- private MockServletConfig config = null;
- private EnhancedMockHttpServletRequest request = null;
- private EnhancedMockHttpSession session = null;
+ private ServletConfig config = null;
+ private HttpServletRequest request = null;
private HttpServletResponse response = null;
-
@BeforeClass
- public static void init() {
+ public static void init()
+ {
tc = new TurbineConfig(
".",
"/conf/test/CompleteTurbineResources.properties");
@@ -67,25 +66,13 @@ public class DefaultACLCreationValveTest
}
@Before
- public void setUpBefore() throws Exception {
- config = new MockServletConfig();
- config.setupNoParameters();
- request = new EnhancedMockHttpServletRequest();
- request.setupServerName("bob");
- request.setupGetProtocol("http");
- request.setupScheme("scheme");
- request.setupPathInfo("damn");
- request.setupGetServletPath("damn2");
- request.setupGetContextPath("wow");
- request.setupGetContentType("html/text");
- request.setupAddHeader("Content-type", "html/text");
- request.setupAddHeader("Accept-Language", "en-US");
- session = new EnhancedMockHttpSession();
- response = new MockHttpServletResponse();
- request.setSession(session);
+ public void setUpBefore() throws Exception
+ {
+ config = mock(ServletConfig.class);
+ request = getMockRequest();
+ response = mock(HttpServletResponse.class);
}
-
@Test public void testLoggedInUser() throws Exception
{
RunData runData = getRunData(request,response,config);
@@ -109,9 +96,10 @@ public class DefaultACLCreationValveTest
assertTrue(user.hasLoggedIn());
assertNotNull(runData.getACL());
}
-
+
@AfterClass
- public static void destroy() {
+ public static void destroy()
+ {
tc.dispose();
}
}
Modified:
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultLoginValveTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultLoginValveTest.java?rev=1754909&r1=1754908&r2=1754909&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultLoginValveTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultLoginValveTest.java
Tue Aug 2 12:55:35 2016
@@ -25,10 +25,15 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.util.Vector;
+import javax.servlet.ServletConfig;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.modules.actions.LoginUser;
@@ -36,8 +41,6 @@ import org.apache.turbine.om.security.Us
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.security.SecurityService;
import org.apache.turbine.test.BaseTestCase;
-import org.apache.turbine.test.EnhancedMockHttpServletRequest;
-import org.apache.turbine.test.EnhancedMockHttpSession;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
import org.junit.AfterClass;
@@ -45,9 +48,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import com.mockobjects.servlet.MockHttpServletResponse;
-import com.mockobjects.servlet.MockServletConfig;
-
/**
* Tests TurbinePipeline.
*
@@ -58,15 +58,15 @@ import com.mockobjects.servlet.MockServl
public class DefaultLoginValveTest extends BaseTestCase
{
private static TurbineConfig tc = null;
- private MockServletConfig config = null;
- private EnhancedMockHttpServletRequest request = null;
- private EnhancedMockHttpSession session = null;
+ private ServletConfig config = null;
+ private HttpServletRequest request = null;
private HttpServletResponse response = null;
+ private HttpSession session = null;
private SecurityService securityService = null;
-
@BeforeClass
- public static void init() {
+ public static void init()
+ {
tc = new TurbineConfig(
".",
"/conf/test/CompleteTurbineResources.properties");
@@ -74,24 +74,12 @@ public class DefaultLoginValveTest exten
}
@Before
- public void setUpBefore() throws Exception {
- config = new MockServletConfig();
- config.setupNoParameters();
- request = new EnhancedMockHttpServletRequest();
- request.setupServerName("bob");
- request.setupGetProtocol("http");
- request.setupScheme("scheme");
- request.setupPathInfo("damn");
- request.setupGetServletPath("damn2");
- request.setupGetContextPath("wow");
- request.setupGetContentType("html/text");
- request.setupAddHeader("Content-type", "html/text");
- request.setupAddHeader("Accept-Language", "en-US");
-
- session = new EnhancedMockHttpSession();
- response = new MockHttpServletResponse();
-
- request.setSession(session);
+ public void setUpBefore() throws Exception
+ {
+ config = mock(ServletConfig.class);
+ request = getMockRequest();
+ response = mock(HttpServletResponse.class);
+ session = request.getSession();
// User must exist
securityService =
(SecurityService)TurbineServices.getInstance().getService(SecurityService.SERVICE_NAME);
@@ -108,15 +96,13 @@ public class DefaultLoginValveTest exten
*/
@Test public void testDefaults() throws Exception
{
- session.setupGetAttribute(User.SESSION_KEY, null);
-
Vector<String> v = new Vector<String>();
v.add(LoginUser.CGI_USERNAME);
v.add(LoginUser.CGI_PASSWORD);
- request.setupGetParameterNames(v.elements());
+ when(request.getParameterNames()).thenReturn(v.elements());
- request.setupAddParameter(LoginUser.CGI_USERNAME,"username");
- request.setupAddParameter(LoginUser.CGI_PASSWORD,"password");
+
when(request.getParameterValues(LoginUser.CGI_USERNAME)).thenReturn(new
String[] { "username" });
+
when(request.getParameterValues(LoginUser.CGI_PASSWORD)).thenReturn(new
String[] { "password" });
RunData runData = getRunData(request,response,config);
runData.setAction(TurbineConstants.ACTION_LOGIN_DEFAULT);
@@ -142,7 +128,7 @@ public class DefaultLoginValveTest exten
{
User user = securityService.getUser("username");
user.setHasLoggedIn(Boolean.TRUE);
- session.setupGetAttribute(User.SESSION_KEY, user);
+ session.setAttribute(User.SESSION_KEY, user);
RunData runData = getRunData(request,response,config);
runData.setAction(TurbineConstants.ACTION_LOGOUT_DEFAULT);
@@ -162,7 +148,8 @@ public class DefaultLoginValveTest exten
}
@AfterClass
- public static void destroy() {
+ public static void destroy()
+ {
tc.dispose();
}
}
Modified:
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java?rev=1754909&r1=1754908&r2=1754909&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java
Tue Aug 2 12:55:35 2016
@@ -20,17 +20,18 @@ package org.apache.turbine.pipeline;
*/
import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.util.Vector;
+import javax.servlet.ServletConfig;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
-import org.apache.turbine.om.security.User;
import org.apache.turbine.test.BaseTestCase;
-import org.apache.turbine.test.EnhancedMockHttpServletRequest;
-import org.apache.turbine.test.EnhancedMockHttpSession;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.uri.URIConstants;
@@ -39,9 +40,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import com.mockobjects.servlet.MockHttpServletResponse;
-import com.mockobjects.servlet.MockServletConfig;
-
/**
* Tests TurbinePipeline.
*
@@ -53,9 +51,8 @@ import com.mockobjects.servlet.MockServl
public class DefaultSessionTimeoutValveTest extends BaseTestCase
{
private static TurbineConfig tc = null;
- private MockServletConfig config = null;
- private EnhancedMockHttpServletRequest request = null;
- private EnhancedMockHttpSession session = null;
+ private ServletConfig config = null;
+ private HttpServletRequest request = null;
private HttpServletResponse response = null;
@BeforeClass
@@ -70,26 +67,9 @@ public class DefaultSessionTimeoutValveT
@Before
public void setUpBefore() throws Exception
{
- config = new MockServletConfig();
- config.setupNoParameters();
- request = new EnhancedMockHttpServletRequest();
- request.setupServerName("bob");
- request.setupGetProtocol("http");
- request.setupScheme("scheme");
- request.setupPathInfo("damn");
- request.setupGetServletPath("damn2");
- request.setupGetContextPath("wow");
- request.setupGetContentType("html/text");
- request.setupAddHeader("Content-type", "html/text");
- request.setupAddHeader("Accept-Language", "en-US");
-
- session = new EnhancedMockHttpSession();
- response = new MockHttpServletResponse();
-
- session.setupGetAttribute(User.SESSION_KEY, null);
-
- request.setSession(session);
-
+ config = mock(ServletConfig.class);
+ request = getMockRequest();
+ response = mock(HttpServletResponse.class);
}
/**
@@ -101,10 +81,11 @@ public class DefaultSessionTimeoutValveT
// reset
Turbine.getConfiguration().setProperty(TurbineConstants.SESSION_TIMEOUT_KEY,
Integer.valueOf(TurbineConstants.SESSION_TIMEOUT_DEFAULT));
+
Vector<String> v = new Vector<String>();
v.add(URIConstants.CGI_ACTION_PARAM);
- request.setupGetParameterNames(v.elements());
- request.setupAddParameter(URIConstants.CGI_ACTION_PARAM, "TestAction");
+ when(request.getParameterNames()).thenReturn(v.elements());
+
when(request.getParameterValues(URIConstants.CGI_ACTION_PARAM)).thenReturn(new
String[] { "TestAction" });
PipelineData pipelineData = getPipelineData(request, response, config);
Modified:
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionValidationValveTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionValidationValveTest.java?rev=1754909&r1=1754908&r2=1754909&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionValidationValveTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionValidationValveTest.java
Tue Aug 2 12:55:35 2016
@@ -21,8 +21,17 @@ package org.apache.turbine.pipeline;
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
import java.util.Vector;
+import javax.servlet.ServletConfig;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.fulcrum.security.model.turbine.entity.impl.TurbineUserImpl;
@@ -31,8 +40,6 @@ import org.apache.turbine.modules.action
import org.apache.turbine.om.security.DefaultUserImpl;
import org.apache.turbine.om.security.User;
import org.apache.turbine.test.BaseTestCase;
-import org.apache.turbine.test.EnhancedMockHttpServletRequest;
-import org.apache.turbine.test.EnhancedMockHttpSession;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
import org.junit.AfterClass;
@@ -40,11 +47,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import com.mockobjects.servlet.MockHttpServletResponse;
-import com.mockobjects.servlet.MockServletConfig;
-
-import static org.junit.Assert.*;
-
/**
* Tests TurbinePipeline.
*
@@ -55,41 +57,25 @@ import static org.junit.Assert.*;
public class DefaultSessionValidationValveTest extends BaseTestCase
{
private static TurbineConfig tc = null;
- private MockServletConfig config = null;
- private EnhancedMockHttpServletRequest request = null;
- private EnhancedMockHttpSession session = null;
+ private ServletConfig config = null;
+ private HttpServletRequest request = null;
private HttpServletResponse response = null;
-
-
@BeforeClass
- public static void init() {
+ public static void init()
+ {
tc = new TurbineConfig(
".",
"/conf/test/CompleteTurbineResources.properties");
tc.initialize();
}
-
- @Before
- public void setUpBefore() throws Exception {
- config = new MockServletConfig();
- config.setupNoParameters();
- request = new EnhancedMockHttpServletRequest();
- request.setupServerName("bob");
- request.setupGetProtocol("http");
- request.setupScheme("scheme");
- request.setupPathInfo("damn");
- request.setupGetServletPath("damn2");
- request.setupGetContextPath("wow");
- request.setupGetContentType("html/text");
- request.setupAddHeader("Content-type", "html/text");
- request.setupAddHeader("Accept-Language", "en-US");
-
- session = new EnhancedMockHttpSession();
- response = new MockHttpServletResponse();
-
- request.setSession(session);
+ @Before
+ public void setUpBefore() throws Exception
+ {
+ config = mock(ServletConfig.class);
+ request = getMockRequest();
+ response = mock(HttpServletResponse.class);
}
/**
@@ -100,10 +86,10 @@ public class DefaultSessionValidationVal
Vector<String> v = new Vector<String>();
v.add(LoginUser.CGI_USERNAME);
v.add(LoginUser.CGI_PASSWORD);
- request.setupGetParameterNames(v.elements());
+ when(request.getParameterNames()).thenReturn(v.elements());
- request.setupAddParameter(LoginUser.CGI_USERNAME,"username");
- request.setupAddParameter(LoginUser.CGI_PASSWORD,"password");
+
when(request.getParameterValues(LoginUser.CGI_USERNAME)).thenReturn(new
String[] { "username" });
+
when(request.getParameterValues(LoginUser.CGI_PASSWORD)).thenReturn(new
String[] { "password" });
RunData runData = getRunData(request,response,config);
runData.setAction(TurbineConstants.ACTION_LOGIN_DEFAULT);
@@ -127,10 +113,10 @@ public class DefaultSessionValidationVal
Vector<String> v = new Vector<String>();
v.add(LoginUser.CGI_USERNAME);
v.add(LoginUser.CGI_PASSWORD);
- request.setupGetParameterNames(v.elements());
+ when(request.getParameterNames()).thenReturn(v.elements());
- request.setupAddParameter(LoginUser.CGI_USERNAME,"username");
- request.setupAddParameter(LoginUser.CGI_PASSWORD,"password");
+
when(request.getParameterValues(LoginUser.CGI_USERNAME)).thenReturn(new
String[] { "username" });
+
when(request.getParameterValues(LoginUser.CGI_PASSWORD)).thenReturn(new
String[] { "password" });
RunData runData = getRunData(request,response,config);
User tu = new DefaultUserImpl(new TurbineUserImpl());
@@ -138,7 +124,7 @@ public class DefaultSessionValidationVal
tu.setHasLoggedIn(Boolean.TRUE);
runData.setAction("TestAction");
- session.setupGetAttribute(User.SESSION_KEY, tu);
+ request.getSession().setAttribute(User.SESSION_KEY, tu);
Pipeline pipeline = new TurbinePipeline();
PipelineData pipelineData = runData;
@@ -153,9 +139,10 @@ public class DefaultSessionValidationVal
assertEquals("username",user.getName());
assertTrue(user.hasLoggedIn());
}
-
+
@AfterClass
- public static void destroy() {
+ public static void destroy()
+ {
tc.dispose();
}
}
Modified:
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DetermineActionValveTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/pipeline/DetermineActionValveTest.java?rev=1754909&r1=1754908&r2=1754909&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DetermineActionValveTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DetermineActionValveTest.java
Tue Aug 2 12:55:35 2016
@@ -22,15 +22,16 @@ package org.apache.turbine.pipeline;
import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.util.Vector;
+import javax.servlet.ServletConfig;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.turbine.om.security.User;
import org.apache.turbine.test.BaseTestCase;
-import org.apache.turbine.test.EnhancedMockHttpServletRequest;
-import org.apache.turbine.test.EnhancedMockHttpSession;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.uri.URIConstants;
@@ -39,9 +40,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import com.mockobjects.servlet.MockHttpServletResponse;
-import com.mockobjects.servlet.MockServletConfig;
-
/**
* Tests TurbinePipeline.
*
@@ -52,15 +50,13 @@ import com.mockobjects.servlet.MockServl
public class DetermineActionValveTest extends BaseTestCase
{
private static TurbineConfig tc = null;
- private MockServletConfig config = null;
- private EnhancedMockHttpServletRequest request = null;
- private EnhancedMockHttpSession session = null;
+ private ServletConfig config = null;
+ private HttpServletRequest request = null;
private HttpServletResponse response = null;
-
-
@BeforeClass
- public static void init() {
+ public static void init()
+ {
tc = new TurbineConfig(
".",
"/conf/test/CompleteTurbineResources.properties");
@@ -68,31 +64,17 @@ public class DetermineActionValveTest ex
}
@Before
- public void setUpBefore() throws Exception {
- config = new MockServletConfig();
- config.setupNoParameters();
- request = new EnhancedMockHttpServletRequest();
- request.setupServerName("bob");
- request.setupGetProtocol("http");
- request.setupScheme("scheme");
- request.setupPathInfo("damn");
- request.setupGetServletPath("damn2");
- request.setupGetContextPath("wow");
- request.setupGetContentType("html/text");
- request.setupAddHeader("Content-type", "html/text");
- request.setupAddHeader("Accept-Language", "en-US");
+ public void setUpBefore() throws Exception
+ {
+ config = mock(ServletConfig.class);
+ request = getMockRequest();
+ response = mock(HttpServletResponse.class);
Vector<String> v = new Vector<String>();
v.add(URIConstants.CGI_ACTION_PARAM);
- request.setupGetParameterNames(v.elements());
+ when(request.getParameterNames()).thenReturn(v.elements());
- request.setupAddParameter(URIConstants.CGI_ACTION_PARAM,"TestAction");
-
- session = new EnhancedMockHttpSession();
- response = new MockHttpServletResponse();
-
- session.setupGetAttribute(User.SESSION_KEY, null);
- request.setSession(session);
+
when(request.getParameterValues(URIConstants.CGI_ACTION_PARAM)).thenReturn(new
String[] { "TestAction" });
}
/**
@@ -111,7 +93,7 @@ public class DetermineActionValveTest ex
pipeline.invoke(pipelineData);
assertEquals("TestAction",runData.getAction());
}
-
+
@AfterClass
public static void destroy() {
tc.dispose();
Modified:
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DetermineTargetValveTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/pipeline/DetermineTargetValveTest.java?rev=1754909&r1=1754908&r2=1754909&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DetermineTargetValveTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DetermineTargetValveTest.java
Tue Aug 2 12:55:35 2016
@@ -21,14 +21,17 @@ package org.apache.turbine.pipeline;
*/
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
import java.util.Vector;
+import javax.servlet.ServletConfig;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.turbine.om.security.User;
import org.apache.turbine.test.BaseTestCase;
-import org.apache.turbine.test.EnhancedMockHttpServletRequest;
-import org.apache.turbine.test.EnhancedMockHttpSession;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.uri.URIConstants;
@@ -37,11 +40,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import com.mockobjects.servlet.MockHttpServletResponse;
-import com.mockobjects.servlet.MockServletConfig;
-
-import static org.junit.Assert.*;
-
/**
* Tests TurbinePipeline.
*
@@ -52,14 +50,13 @@ import static org.junit.Assert.*;
public class DetermineTargetValveTest extends BaseTestCase
{
private static TurbineConfig tc = null;
- private MockServletConfig config = null;
- private EnhancedMockHttpServletRequest request = null;
- private EnhancedMockHttpSession session = null;
+ private ServletConfig config = null;
+ private HttpServletRequest request = null;
private HttpServletResponse response = null;
-
@BeforeClass
- public static void init() {
+ public static void init()
+ {
tc = new TurbineConfig(
".",
"/conf/test/CompleteTurbineResources.properties");
@@ -67,25 +64,11 @@ public class DetermineTargetValveTest ex
}
@Before
- public void setUpBefore() throws Exception {
- config = new MockServletConfig();
- config.setupNoParameters();
- request = new EnhancedMockHttpServletRequest();
- request.setupServerName("bob");
- request.setupGetProtocol("http");
- request.setupScheme("scheme");
- request.setupPathInfo("damn");
- request.setupGetServletPath("damn2");
- request.setupGetContextPath("wow");
- request.setupGetContentType("html/text");
- request.setupAddHeader("Content-type", "html/text");
- request.setupAddHeader("Accept-Language", "en-US");
-
- session = new EnhancedMockHttpSession();
- response = new MockHttpServletResponse();
-
- session.setupGetAttribute(User.SESSION_KEY, null);
- request.setSession(session);
+ public void setUpBefore() throws Exception
+ {
+ config = mock(ServletConfig.class);
+ request = getMockRequest();
+ response = mock(HttpServletResponse.class);
}
/**
@@ -95,9 +78,9 @@ public class DetermineTargetValveTest ex
{
Vector<String> v = new Vector<String>();
v.add(URIConstants.CGI_SCREEN_PARAM);
- request.setupGetParameterNames(v.elements());
+ when(request.getParameterNames()).thenReturn(v.elements());
- request.setupAddParameter(URIConstants.CGI_SCREEN_PARAM,"TestScreen");
+
when(request.getParameterValues(URIConstants.CGI_SCREEN_PARAM)).thenReturn(new
String[] { "TestScreen" });
RunData runData = getRunData(request,response,config);
@@ -114,11 +97,9 @@ public class DetermineTargetValveTest ex
{
Vector<String> v = new Vector<String>();
v.add(URIConstants.CGI_SCREEN_PARAM);
- request.setupGetParameterNames(v.elements());
+ when(request.getParameterNames()).thenReturn(v.elements());
- String screens[] = new String[1];
- screens[0]=null;
- request.setupAddParameter(URIConstants.CGI_SCREEN_PARAM,screens);
+
when(request.getParameterValues(URIConstants.CGI_SCREEN_PARAM)).thenReturn(new
String[] { null });
RunData runData = getRunData(request,response,config);
@@ -131,9 +112,10 @@ public class DetermineTargetValveTest ex
pipeline.invoke(pipelineData);
assertEquals("",runData.getScreen());
}
-
+
@AfterClass
- public static void destroy() {
+ public static void destroy()
+ {
tc.dispose();
}
}
Modified:
turbine/core/trunk/src/test/org/apache/turbine/pipeline/ExecutePageValveTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/pipeline/ExecutePageValveTest.java?rev=1754909&r1=1754908&r2=1754909&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/pipeline/ExecutePageValveTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/pipeline/ExecutePageValveTest.java
Tue Aug 2 12:55:35 2016
@@ -24,9 +24,14 @@ package org.apache.turbine.pipeline;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.util.Vector;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.fulcrum.security.model.turbine.entity.impl.TurbineUserImpl;
@@ -35,9 +40,6 @@ import org.apache.turbine.modules.action
import org.apache.turbine.om.security.DefaultUserImpl;
import org.apache.turbine.om.security.User;
import org.apache.turbine.test.BaseTestCase;
-import org.apache.turbine.test.EnhancedMockHttpServletRequest;
-import org.apache.turbine.test.EnhancedMockHttpServletResponse;
-import org.apache.turbine.test.EnhancedMockHttpSession;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.uri.URIConstants;
@@ -46,8 +48,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import com.mockobjects.servlet.MockServletConfig;
-
/**
* Tests ExecutePageValve.
*
@@ -58,14 +58,13 @@ import com.mockobjects.servlet.MockServl
public class ExecutePageValveTest extends BaseTestCase
{
private static TurbineConfig tc = null;
- private MockServletConfig config = null;
- private EnhancedMockHttpServletRequest request = null;
- private EnhancedMockHttpSession session = null;
+ private ServletConfig config = null;
+ private HttpServletRequest request = null;
private HttpServletResponse response = null;
-
@BeforeClass
- public static void init() {
+ public static void init()
+ {
tc = new TurbineConfig(
".",
"/conf/test/CompleteTurbineResources.properties");
@@ -75,34 +74,21 @@ public class ExecutePageValveTest extend
@Before
public void setUpBefore() throws Exception
{
- config = new MockServletConfig();
- config.setupNoParameters();
- request = new EnhancedMockHttpServletRequest();
- request.setupServerName("bob");
- request.setupGetProtocol("http");
- request.setupScheme("scheme");
- request.setupPathInfo("damn");
- request.setupGetServletPath("damn2");
- request.setupGetContextPath("wow");
- request.setupGetContentType("html/text");
- request.setupAddHeader("Content-type", "html/text");
- request.setupAddHeader("Accept-Language", "en-US");
-
- session = new EnhancedMockHttpSession();
- response = new EnhancedMockHttpServletResponse();
-
- request.setSession(session);
+ config = mock(ServletConfig.class);
+ request = getMockRequest();
+ response = mock(HttpServletResponse.class);
+ ServletOutputStream sos = mock(ServletOutputStream.class);
+ when(response.getOutputStream()).thenReturn(sos);
}
@Test public void testValve() throws Exception
{
Vector<String> v = new Vector<String>();
v.add(URIConstants.CGI_TEMPLATE_PARAM);
- request.setupGetParameterNames(v.elements());
- String nulls[] = new String[1];
- nulls[0]="Index.vm";
- request.setupAddParameter(URIConstants.CGI_TEMPLATE_PARAM, nulls);
+ when(request.getParameterNames()).thenReturn(v.elements());
+
+
when(request.getParameterValues(URIConstants.CGI_TEMPLATE_PARAM)).thenReturn(new
String[] { "Index.vm" });
RunData runData = getRunData(request, response, config);
runData.setScreenTemplate("ExistPageWithLayout.vm");
@@ -134,10 +120,9 @@ public class ExecutePageValveTest extend
{
Vector<String> v = new Vector<String>();
v.add(URIConstants.CGI_TEMPLATE_PARAM);
- request.setupGetParameterNames(v.elements());
- String nulls[] = new String[1];
- nulls[0]="Index.vm";
- request.setupAddParameter(URIConstants.CGI_TEMPLATE_PARAM, nulls);
+ when(request.getParameterNames()).thenReturn(v.elements());
+
+
when(request.getParameterValues(URIConstants.CGI_TEMPLATE_PARAM)).thenReturn(new
String[] { "Index.vm" });
RunData runData = getRunData(request, response, config);
runData.setScreenTemplate("ExistPageWithLayout.vm");
Modified:
turbine/core/trunk/src/test/org/apache/turbine/services/intake/IntakeToolTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/intake/IntakeToolTest.java?rev=1754909&r1=1754908&r2=1754909&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/services/intake/IntakeToolTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/services/intake/IntakeToolTest.java
Tue Aug 2 12:55:35 2016
@@ -22,22 +22,21 @@ package org.apache.turbine.services.inta
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
import java.io.File;
-import java.util.Vector;
import javax.servlet.ServletConfig;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.fulcrum.intake.IntakeService;
import org.apache.fulcrum.intake.model.Group;
import org.apache.fulcrum.parser.DefaultParameterParser;
import org.apache.turbine.annotation.AnnotationProcessor;
-import org.apache.turbine.om.security.User;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.rundata.RunDataService;
import org.apache.turbine.test.BaseTestCase;
-import org.apache.turbine.test.EnhancedMockHttpServletRequest;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
import org.junit.AfterClass;
@@ -45,10 +44,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import com.mockobjects.servlet.MockHttpServletResponse;
-import com.mockobjects.servlet.MockHttpSession;
-import com.mockobjects.servlet.MockServletConfig;
-
/**
* Unit test for Intake Tool, wrapping the Fulcrum Intake service.
*
@@ -95,23 +90,9 @@ public class IntakeToolTest extends Base
private RunData getRunData() throws Exception
{
RunDataService rds = (RunDataService)
TurbineServices.getInstance().getService(RunDataService.SERVICE_NAME);
- EnhancedMockHttpServletRequest request = new
EnhancedMockHttpServletRequest();
- request.setupServerName("bob");
- request.setupGetProtocol("http");
- request.setupScheme("scheme");
- request.setupPathInfo("damn");
- request.setupGetServletPath("damn2");
- request.setupGetContextPath("wow");
- request.setupGetContentType("html/text");
- request.setupAddHeader("Content-type", "html/text");
- request.setupAddHeader("Accept-Language", "en-US");
- Vector<String> v = new Vector<String>();
- request.setupGetParameterNames(v.elements());
- MockHttpSession session = new MockHttpSession();
- session.setupGetAttribute(User.SESSION_KEY, null);
- request.setSession(session);
- HttpServletResponse response = new MockHttpServletResponse();
- ServletConfig config = new MockServletConfig();
+ ServletConfig config = mock(ServletConfig.class);
+ HttpServletRequest request = getMockRequest();
+ HttpServletResponse response = mock(HttpServletResponse.class);
RunData runData = rds.getRunData(request, response, config);
assertEquals("Verify we are using Fulcrum parameter parser",
DefaultParameterParser.class, runData.getParameters()
.getClass());
Modified:
turbine/core/trunk/src/test/org/apache/turbine/services/localization/LocalizationToolTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/localization/LocalizationToolTest.java?rev=1754909&r1=1754908&r2=1754909&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/services/localization/LocalizationToolTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/services/localization/LocalizationToolTest.java
Tue Aug 2 12:55:35 2016
@@ -22,18 +22,16 @@ package org.apache.turbine.services.loca
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-
-import java.util.Vector;
+import static org.mockito.Mockito.mock;
import javax.servlet.ServletConfig;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.turbine.annotation.AnnotationProcessor;
-import org.apache.turbine.om.security.User;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.rundata.RunDataService;
import org.apache.turbine.test.BaseTestCase;
-import org.apache.turbine.test.EnhancedMockHttpServletRequest;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
import org.junit.AfterClass;
@@ -41,10 +39,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import com.mockobjects.servlet.MockHttpServletResponse;
-import com.mockobjects.servlet.MockHttpSession;
-import com.mockobjects.servlet.MockServletConfig;
-
/**
* Unit test for Localization Tool. Verifies that localization works the same
using the
* deprecated Turbine localization service as well as the new Fulcrum
Localization
@@ -98,23 +92,9 @@ public class LocalizationToolTest extend
private RunData getRunData() throws Exception
{
RunDataService rds = (RunDataService)
TurbineServices.getInstance().getService(RunDataService.SERVICE_NAME);
- EnhancedMockHttpServletRequest request = new
EnhancedMockHttpServletRequest();
- request.setupServerName("bob");
- request.setupGetProtocol("http");
- request.setupScheme("scheme");
- request.setupPathInfo("damn");
- request.setupGetServletPath("damn2");
- request.setupGetContextPath("wow");
- request.setupGetContentType("html/text");
- request.setupAddHeader("Content-type", "html/text");
- request.setupAddHeader("Accept-Language", "en-US");
- Vector<String> v = new Vector<String>();
- request.setupGetParameterNames(v.elements());
- MockHttpSession session = new MockHttpSession();
- session.setupGetAttribute(User.SESSION_KEY, null);
- request.setSession(session);
- HttpServletResponse response = new MockHttpServletResponse();
- ServletConfig config = new MockServletConfig();
+ ServletConfig config = mock(ServletConfig.class);
+ HttpServletRequest request = getMockRequest();
+ HttpServletResponse response = mock(HttpServletResponse.class);
RunData runData = rds.getRunData(request, response, config);
return runData;
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/test/BaseTestCase.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/test/BaseTestCase.java?rev=1754909&r1=1754908&r2=1754909&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/test/BaseTestCase.java
(original)
+++ turbine/core/trunk/src/test/org/apache/turbine/test/BaseTestCase.java Tue
Aug 2 12:55:35 2016
@@ -21,26 +21,36 @@ package org.apache.turbine.test;
*/
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
import java.util.Properties;
import java.util.Vector;
import javax.servlet.ServletConfig;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
import org.apache.log4j.PropertyConfigurator;
import org.apache.turbine.TurbineConstants;
-import org.apache.turbine.om.security.User;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.rundata.RunDataService;
import org.apache.turbine.util.RunData;
import org.junit.BeforeClass;
-
-import com.mockobjects.servlet.MockHttpServletRequest;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
/**
* Base functionality to be extended by all Apache Turbine test cases. Test
@@ -82,28 +92,85 @@ public abstract class BaseTestCase
RunData runData = rds.getRunData(request, response, config);
return runData;
}
+
protected PipelineData getPipelineData(HttpServletRequest
request,HttpServletResponse response,ServletConfig config) throws Exception {
RunData runData = getRunData(request,response,config);
return runData;
}
+ protected Map<String,Object> attributes = new HashMap<String,Object>();
+ protected int maxInactiveInterval = 0;
+
+ @SuppressWarnings("boxing")
+ protected HttpServletRequest getMockRequest()
+ {
+ HttpServletRequest request = mock(HttpServletRequest.class);
+ HttpSession session = mock(HttpSession.class);
+
+ doAnswer(new Answer<Object>()
+ {
+ @Override
+ public Object answer(InvocationOnMock invocation) throws Throwable
+ {
+ String key = (String) invocation.getArguments()[0];
+ return attributes.get(key);
+ }
+ }).when(session).getAttribute(anyString());
+
+ doAnswer(new Answer<Object>()
+ {
+ @Override
+ public Object answer(InvocationOnMock invocation) throws Throwable
+ {
+ String key = (String) invocation.getArguments()[0];
+ Object value = invocation.getArguments()[1];
+ attributes.put(key, value);
+ return null;
+ }
+ }).when(session).setAttribute(anyString(), any());
+
+ when(session.getMaxInactiveInterval()).thenReturn(maxInactiveInterval);
+
+ doAnswer(new Answer<Integer>()
+ {
+ @Override
+ public Integer answer(InvocationOnMock invocation) throws Throwable
+ {
+ return Integer.valueOf(maxInactiveInterval);
+ }
+ }).when(session).getMaxInactiveInterval();
+
+ doAnswer(new Answer<Object>()
+ {
+ @Override
+ public Object answer(InvocationOnMock invocation) throws Throwable
+ {
+ Integer value = (Integer) invocation.getArguments()[0];
+ maxInactiveInterval = value.intValue();
+ return null;
+ }
+ }).when(session).setMaxInactiveInterval(anyInt());
+
+ when(session.isNew()).thenReturn(true);
+ when(request.getSession()).thenReturn(session);
+
+ when(request.getServerName()).thenReturn("bob");
+ when(request.getProtocol()).thenReturn("http");
+ when(request.getScheme()).thenReturn("scheme");
+ when(request.getPathInfo()).thenReturn("damn");
+ when(request.getServletPath()).thenReturn("damn2");
+ when(request.getContextPath()).thenReturn("wow");
+ when(request.getContentType()).thenReturn("html/text");
+
+ when(request.getCharacterEncoding()).thenReturn("US-ASCII");
+ when(request.getServerPort()).thenReturn(8080);
+ when(request.getLocale()).thenReturn(Locale.US);
+
+ when(request.getHeader("Content-type")).thenReturn("html/text");
+ when(request.getHeader("Accept-Language")).thenReturn("en-US");
- protected MockHttpServletRequest getMockRequest(){
- EnhancedMockHttpServletRequest request = new
EnhancedMockHttpServletRequest();
- EnhancedMockHttpSession session = new EnhancedMockHttpSession();
- session.setupGetAttribute(User.SESSION_KEY, null);
- request.setupServerName("bob");
- request.setupGetProtocol("http");
- request.setupScheme("scheme");
- request.setupPathInfo("damn");
- request.setupGetServletPath("damn2");
- request.setupGetContextPath("wow");
- request.setupGetContentType("html/text");
- request.setupAddHeader("Content-type", "html/text");
- request.setupAddHeader("Accept-Language", "en-US");
Vector<String> v = new Vector<String>();
- request.setupGetParameterNames(v.elements());
- request.setSession(session);
+ when(request.getParameterNames()).thenReturn(v.elements());
return request;
}
}
