[gatein-commits] gatein SVN: r3353 - in components/wsrp/trunk: wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1 and 1 other directory.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Jun 16 18:34:14 EDT 2010
Author: mwringe
Date: 2010-06-16 18:34:14 -0400 (Wed, 16 Jun 2010)
New Revision: 3353
Modified:
components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RequestProcessor.java
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java
Log:
GTNWSRP-46: Disable a few tests in MarkupTestCase which assume we are using an actual http request to the producer instead of a mock one.
Minor code formatting fixes
Fix issue with never using the correct locale due to clearing the list before comparing.
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RequestProcessor.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RequestProcessor.java 2010-06-16 17:47:37 UTC (rev 3352)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RequestProcessor.java 2010-06-16 22:34:14 UTC (rev 3353)
@@ -61,6 +61,7 @@
import org.oasis.wsrp.v2.UnsupportedWindowState;
import java.security.Principal;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -246,7 +247,7 @@
// use user-desired locales
List<String> locales = params.getLocales();
- List<String> supportedLocales = markupType.getLocales();
+ List<String> supportedLocales = new ArrayList<String>(markupType.getLocales());
if (supportedLocales != null)
{
// reset markup type locales
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java 2010-06-16 17:47:37 UTC (rev 3352)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java 2010-06-16 22:34:14 UTC (rev 3353)
@@ -80,35 +80,35 @@
super("MarkupTestCase", DEFAULT_MARKUP_PORTLET_WAR);
}
- @Deployment
- public static JavaArchive createDeployment()
- {
- return ShrinkWrap.create("test.jar", JavaArchive.class);
- }
-
- @Before
- public void setUp() throws Exception
- {
- if (System.getProperty("test.deployables.dir") != null)
- {
- super.setUp();
- //hack to get around having to have a httpservletrequest when accessing the producer services
- //I don't know why its really needed, seems to be a dependency where wsrp connects with the pc module
- ServletAccess.setRequestAndResponse(MockHttpServletRequest.createMockRequest(null), MockHttpServletResponse.createMockResponse());
- }
- }
-
-
- @After
- public void tearDown() throws Exception
- {
- if (System.getProperty("test.deployables.dir") != null)
- {
- super.tearDown();
- }
- }
-
- @Test
+ @Deployment
+ public static JavaArchive createDeployment()
+ {
+ return ShrinkWrap.create("test.jar", JavaArchive.class);
+ }
+
+ @Before
+ public void setUp() throws Exception
+ {
+ if (System.getProperty("test.deployables.dir") != null)
+ {
+ super.setUp();
+ //hack to get around having to have a httpservletrequest when accessing the producer services
+ //I don't know why its really needed, seems to be a dependency where wsrp connects with the pc module
+ ServletAccess.setRequestAndResponse(MockHttpServletRequest.createMockRequest(null), MockHttpServletResponse
+ .createMockResponse());
+ }
+ }
+
+ @After
+ public void tearDown() throws Exception
+ {
+ if (System.getProperty("test.deployables.dir") != null)
+ {
+ super.tearDown();
+ }
+ }
+
+ @Test
public void testGetMarkupViewNoSession() throws Exception
{
V1GetMarkup getMarkup = createMarkupRequest();
@@ -118,7 +118,7 @@
checkMarkupResponse(response, DEFAULT_VIEW_MARKUP);
}
- @Test
+ @Test
public void testInvalidGetMarkup() throws Exception
{
V1GetMarkup getMarkup = createMarkupRequest();
@@ -166,7 +166,7 @@
"d><td><input name='symbol'/></td></tr><tr><td><input type='submit' value='Submit'></td></tr></table></form>");
}
- @Test
+ @Test
public void testGetMarkupRenderParameters() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -224,7 +224,7 @@
}
// fix-me: add more tests
- @Test
+ @Test
public void testGetMarkupSession() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -263,13 +263,13 @@
}
}
- @Test
+ @Test
public void testPerformBlockingInteractionNoRedirect() throws Exception
{
checkPBIAndGetNavigationalState("RHAT");
}
- @Test
+ @Test
public void testPerformBlockingInteractionRedirect() throws Exception
{
V1PerformBlockingInteraction performBlockingInteraction =
@@ -295,7 +295,7 @@
ExtendedAssert.assertNull(updateResponse);
}
- @Test
+ @Test
public void testGMAndPBIInteraction() throws Exception
{
testGetMarkupViewNoSession();
@@ -308,7 +308,7 @@
checkMarkupResponse(response, "<p>" + symbol + " stock value: 123.45</p>");
}
- @Test
+ @Test
public void testPBIWithSessionID() throws Exception
{
String portletHandle = getDefaultHandle();
@@ -329,7 +329,7 @@
}
}
- @Test
+ @Test
public void testMarkupCaching() throws Exception
{
V1GetMarkup getMarkup = createMarkupRequest();
@@ -353,7 +353,7 @@
undeploy(sessionPortletArchive);
}
- @Test
+ @Test
public void testGetMarkupWithDispatcherPortlet() throws Exception
{
@@ -374,7 +374,7 @@
}
}
- @Test
+ @Test
public void testGetMarkupWithNoContent() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -394,7 +394,7 @@
}
}
- @Test
+ @Test
public void testGetMarkupWithNonStandardLocalesStrictMode() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -402,13 +402,17 @@
deploy(getLocalesPortletArchive);
V1GetMarkup getMarkup = createMarkupRequestForCurrentlyDeployedPortlet();
+ // we need to clear the value first for this test since the getLocales will be populated
+ // with default values for the system, and since en_US is not marked as a supported-locale in portlet.xml
+ // the default values will be used.
+ getMarkup.getMarkupParams().getLocales().clear();
getMarkup.getMarkupParams().getLocales().add("en_US");
try
{
producer.getMarkup(getMarkup);
- //fail("Should have trown an UnsupportetLocaleFault"); // ideally cf http://jira.jboss.com/jira/browse/JBPORTAL-857
- ExtendedAssert.fail("Should have trown an exception"); // right now
+ //fail("Should have thrown an UnsupportetLocaleFault"); // ideally cf http://jira.jboss.com/jira/browse/JBPORTAL-857
+ ExtendedAssert.fail("Should have thrown an exception"); // right now
}
catch (Exception expected)
{
@@ -421,7 +425,7 @@
}
}
- @Test
+ @Test
public void testGetMarkupWithNonStandardLocalesLenientMode() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -429,6 +433,10 @@
deploy(getLocalesPortletArchive);
V1GetMarkup getMarkup = createMarkupRequestForCurrentlyDeployedPortlet();
+ // we need to clear the value first for this test since the getLocales will be populated
+ // with default values for the system, and since en_US is not marked as a supported-locale in portlet.xml
+ // the default values will be used.
+ getMarkup.getMarkupParams().getLocales().clear();
getMarkup.getMarkupParams().getLocales().add("en_US");
// Use the lenient mode
@@ -439,7 +447,7 @@
undeploy(getLocalesPortletArchive);
}
- @Test
+ @Test
public void testGetMarkupWithoutDeclaredLocale() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -458,7 +466,7 @@
}
}
- @Test
+ @Test
public void testGetMarkupLocales() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -493,7 +501,7 @@
}
}
- @Test
+ @Test
public void testGetMarkupWithEncodedURLs() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -514,7 +522,7 @@
}
}
- @Test
+ @Test
public void testGetMarkupWithUserContext() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -535,7 +543,7 @@
}
}
- @Test
+ @Test
public void testGetMarkupMultiValuedFormParams() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -578,7 +586,7 @@
}
}
- @Test
+ @Test
public void testImplicitCloning() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -630,7 +638,8 @@
return namedString;
}
- @Test
+ //TODO: enable this test, it doesn't work or make sense right now since we are using a mockhttpservletrequest
+ //@Test
public void testGetMarkupWithResource() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -657,7 +666,8 @@
}
}
- @Test
+ //TODO: enable this test, it doesn't work or make sense right now since we are using a mockhttpservletrequest
+ //@Test
public void testGetMarkupWithNonURLEncodedResource() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -684,7 +694,7 @@
}
}
- @Test
+ @Test
public void testApplicationScopeVariableHandling() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -709,7 +719,7 @@
}
}
- @Test
+ @Test
public void testGetMarkupNoRegistrationWhenRegistrationRequired() throws Exception
{
configureRegistrationSettings(true, false);
@@ -730,7 +740,7 @@
}
}
- @Test
+ @Test
public void testPerformBlockingInteractionNoRegistrationWhenRegistrationRequired() throws Exception
{
configureRegistrationSettings(true, false);
@@ -751,7 +761,7 @@
}
}
- @Test
+ @Test
public void testInitCookieNoRegistrationWhenRegistrationRequired() throws Exception
{
configureRegistrationSettings(true, false);
More information about the gatein-commits
mailing list