Author: nilsga
Date: Thu Sep 27 12:44:01 2007
New Revision: 580134
URL: http://svn.apache.org/viewvc?rev=580134&view=rev
Log:
Use Spring portlet mock classes
Removed:
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/MockPortletRequest.java
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/MockPortletSession.java
Modified:
struts/struts2/trunk/plugins/portlet/pom.xml
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletRequestMapTest.java
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletSessionMapTest.java
Modified: struts/struts2/trunk/plugins/portlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/pom.xml?rev=580134&r1=580133&r2=580134&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/portlet/pom.xml (original)
+++ struts/struts2/trunk/plugins/portlet/pom.xml Thu Sep 27 12:44:01 2007
@@ -123,14 +123,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
- <version>1.2.8</version>
- <optional>true</optional>
+ <version>2.0.6</version>
+ <scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>1.2.8</version>
- <scope>test</scope>
+ <version>2.0.6</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
Modified:
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletRequestMapTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletRequestMapTest.java?rev=580134&r1=580133&r2=580134&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletRequestMapTest.java
(original)
+++
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletRequestMapTest.java
Thu Sep 27 12:44:01 2007
@@ -20,21 +20,14 @@
*/
package org.apache.struts2.portlet;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.portlet.PortletRequest;
-import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
-import org.jmock.core.Constraint;
+import org.springframework.mock.web.portlet.MockPortletRequest;
/**
@@ -44,7 +37,7 @@
public class PortletRequestMapTest extends MockObjectTestCase {
public void testGet() {
- PortletRequest request = new MockPortletRequest(new HashMap<String,
String[]>(), new HashMap<String, Object>(), null);
+ PortletRequest request = new MockPortletRequest();
request.setAttribute("testAttribute", "testValue");
PortletRequestMap map = new PortletRequestMap(request);
@@ -53,7 +46,7 @@
}
public void testPut() {
- PortletRequest request = new MockPortletRequest(new HashMap<String,
String[]>(), new HashMap<String, Object>(), null);
+ PortletRequest request = new MockPortletRequest();
PortletRequestMap map = new PortletRequestMap(request);
Object obj = map.put("testAttribute", "testValue1");
@@ -62,31 +55,28 @@
}
public void testClear() {
- Map<String, Object> attribs = new HashMap<String, Object>();
- attribs.put("testAttribute1", "testValue1");
- attribs.put("testAttribute2", "testValue2");
- PortletRequest request = new MockPortletRequest(new HashMap<String,
String[]>(), attribs, null);
+ MockPortletRequest request = new MockPortletRequest();
+ request.setAttribute("testAttribute1", "testValue1");
+ request.setAttribute("testAttribute2", "testValue2");
PortletRequestMap map = new PortletRequestMap(request);
map.clear();
- assertEquals(0, attribs.size());
+ assertFalse(request.getAttributeNames().hasMoreElements());
}
public void testRemove() {
- Map<String, Object> attribs = new HashMap<String, Object>();
- attribs.put("testAttribute1", "testValue1");
-
- PortletRequest request = new MockPortletRequest(new HashMap<String,
String[]>(), attribs, null);
-
+ MockPortletRequest request = new MockPortletRequest();
+ request.setAttribute("testAttribute1", "testValue1");
+
PortletRequestMap map = new PortletRequestMap(request);
assertEquals("testValue1", map.remove("testAttribute1"));
assertNull(request.getAttribute("testAttribute1"));
}
public void testEntrySet() {
- PortletRequest request = new MockPortletRequest(new HashMap<String,
String[]>(), new HashMap<String, Object>(), null);
+ MockPortletRequest request = new MockPortletRequest();
request.setAttribute("testAttribute1", "testValue1");
request.setAttribute("testAttribute2", "testValue2");
Modified:
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletSessionMapTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletSessionMapTest.java?rev=580134&r1=580133&r2=580134&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletSessionMapTest.java
(original)
+++
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletSessionMapTest.java
Thu Sep 27 12:44:01 2007
@@ -20,16 +20,16 @@
*/
package org.apache.struts2.portlet;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import javax.portlet.PortletRequest;
import javax.portlet.PortletSession;
import junit.framework.TestCase;
+import org.springframework.mock.web.portlet.MockPortletRequest;
+
/**
* PortletSessionMapTest. Insert description.
@@ -39,7 +39,7 @@
public void testPut() {
- MockPortletRequest request = new MockPortletRequest(null, null, new
HashMap<String, Object>());
+ MockPortletRequest request = new MockPortletRequest();
PortletSessionMap map = new PortletSessionMap(request);
assertEquals("testValue1", map.put("testAttribute1", "testValue1"));
@@ -52,43 +52,46 @@
}
public void testGet() {
- MockPortletRequest request = new MockPortletRequest(null, null, new
HashMap<String, Object>());
+ MockPortletRequest request = new MockPortletRequest();
PortletSession session = request.getPortletSession();
session.setAttribute("testAttribute1", "testValue1");
session.setAttribute("testAttribute2", "testValue2");
PortletSessionMap map = new PortletSessionMap(request);
Object val1 = map.get("testAttribute1");
Object val2 = map.get("testAttribute2");
+ // Assert that the values from the session is in the map
assertEquals("testValue1", val1);
assertEquals("testValue2", val2);
}
public void testClear() {
- Map<String, Object> sessionMap = new HashMap<String, Object>();
- sessionMap.put("testAttribute1", "testValue1");
- sessionMap.put("testAttribute2", "testValue2");
-
- PortletRequest req = new MockPortletRequest(null, null, sessionMap);
-
+ MockPortletRequest req = new MockPortletRequest();
+ PortletSession session = req.getPortletSession();
+ session.setAttribute("testAttribute1", "testValue1");
+ session.setAttribute("testAttribute2", "testValue2");
+
PortletSessionMap map = new PortletSessionMap(req);
map.clear();
- assertEquals(0, sessionMap.size());
+ // Assert that there are no elements in the portlet session
+
assertFalse(req.getPortletSession().getAttributeNames().hasMoreElements());
}
public void testRemove() {
- MockPortletRequest request = new MockPortletRequest(null, null, new
HashMap<String, Object>());
+ MockPortletRequest request = new MockPortletRequest();
PortletSession session = request.getPortletSession();
session.setAttribute("testAttribute1", "testValue1");
PortletSessionMap map = new PortletSessionMap(request);
Object ret = map.remove("testAttribute1");
+ // Assert that the element that was removed was returned and the key
is no longer in the
+ // portlet session
assertEquals("testValue1", ret);
assertNull(session.getAttribute("testAttribute1"));
}
public void testEntrySet() {
- MockPortletRequest request = new MockPortletRequest(null, null, new
HashMap<String, Object>());
+ MockPortletRequest request = new MockPortletRequest();
PortletSession session = request.getPortletSession();
session.setAttribute("testAttribute1", "testValue1");
session.setAttribute("testAttribute2", "testValue2");
