[jboss-cvs] jboss-portal/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer ...
Chris Laprun
chris.laprun at jboss.com
Thu Aug 24 20:56:31 EDT 2006
User: claprun
Date: 06/08/24 20:56:31
Modified: wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer Tag:
JBoss_Portal_Branch_2_4 MarkupTestCase.java
Log:
- Re-wrote cookie/session management. Now handles cookies outside of initCookie calls. Still needs more testing.
- Added ProducerSessionInformationTestCase and other-tests in build.xml for WSRP.
- Minor improvements.
Revision Changes Path
No revision
No revision
1.22.2.1 +6 -9 jboss-portal/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MarkupTestCase.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -b -r1.22 -r1.22.2.1
--- MarkupTestCase.java 8 Aug 2006 20:56:58 -0000 1.22
+++ MarkupTestCase.java 25 Aug 2006 00:56:31 -0000 1.22.2.1
@@ -37,7 +37,7 @@
/**
* @author <a href="mailto:chris.laprun at jboss.com">Chris Laprun</a>
- * @version $Revision: 1.22 $
+ * @version $Revision: 1.22.2.1 $
* @since 2.4 (May 4, 2006)
*/
public class MarkupTestCase extends V1ConsumerBaseTest
@@ -99,9 +99,9 @@
String sessionId = sessionInfo.getSessionIdForPortlet(SOF.PORTLET_HANDLE_2);
assertNotNull(sessionId);
assertEquals(TestWSRPProducerImpl.SESSION_ID, sessionId);
- assertNull(sessionInfo.getUserCookie());
+ assertNotNull(sessionInfo.getUserCookie());
assertFalse(sessionInfo.isPerGroupCookies());
- assertFalse(sessionInfo.isUserCookiesInitialized());
+ assertFalse(sessionInfo.isInitCookieDone());
consumer.invoke(render);
checkRenderResult(render, "portlet2:1:view:maximized");
@@ -119,9 +119,7 @@
ProducerSessionInformation sessionInfo = consumer.getProducerSessionInformationFrom(session);
assertFalse(sessionInfo.isPerGroupCookies());
- assertFalse(sessionInfo.isUserCookiesInitialized());
- String userCookie = sessionInfo.getUserCookie();
- assertNull(userCookie);
+ assertFalse(sessionInfo.isInitCookieDone());
// now require cookie initialization and check that everything went well
producer.setRequiresInitCookie(CookieProtocol.perUser);
@@ -134,9 +132,8 @@
sessionInfo = consumer.getProducerSessionInformationFrom(session);
assertFalse(sessionInfo.isPerGroupCookies());
- assertTrue(sessionInfo.isUserCookiesInitialized());
- userCookie = sessionInfo.getUserCookie();
- assertNotNull(userCookie);
+ assertTrue(sessionInfo.isInitCookieDone());
+ assertNotNull(sessionInfo.getUserCookie());
}
private FragmentResult checkRenderResult(RenderInvocation render, String markup)
More information about the jboss-cvs-commits
mailing list