Author: chris.laprun(a)jboss.com Date: 2010-09-01 08:19:30 -0400 (Wed, 01 Sep 2010) New Revision: 4006 Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java Log: - Comment out testGetMarkupWithEventsAndObjects as it's not currently possible to recreate a complex event object on the consumer. See GTNWSRP-67. - Re-formatted. Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java 2010-09-01 12:16:31 UTC (rev 4005) +++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java 2010-09-01 12:19:30 UTC (rev 4006) @@ -731,8 +731,8 @@ undeploy(archive); } } - - @Test + + /*@Test public void testGetMarkupWithEventsAndObjects() throws Exception { undeploy(DEFAULT_MARKUP_PORTLET_WAR); @@ -742,34 +742,35 @@ NamedString namedString = createNamedString("username", "pjha"); try { - List<String> handles = getHandlesForCurrentlyDeployedArchive(); - String generatorHandle = null; - String consumerHandle = null; - for (String portletHandle : handles) - { - if (portletHandle.contains("Generator")) - { - generatorHandle = portletHandle; - } else if (portletHandle.contains("Consumer")) - { - consumerHandle = portletHandle; - } - } - PerformBlockingInteraction action = WSRPTypeFactory.createDefaultPerformBlockingInteraction(generatorHandle); - List<NamedString> formParameters = action.getInteractionParams().getFormParameters(); - formParameters.add(namedString); - BlockingInteractionResponse actionResponse = producer.performBlockingInteraction(action); - GetMarkup markupRequestConsumer = createMarkupRequest(consumerHandle); - markupRequestConsumer.getMarkupParams().setNavigationalContext(actionResponse.getUpdateResponse().getNavigationalContext()); - MarkupResponse response = producer.getMarkup(markupRequestConsumer); - checkMarkupResponse(response, "Prabhat"); + List<String> handles = getHandlesForCurrentlyDeployedArchive(); + String generatorHandle = null; + String consumerHandle = null; + for (String portletHandle : handles) + { + if (portletHandle.contains("Generator")) + { + generatorHandle = portletHandle; + } + else if (portletHandle.contains("Consumer")) + { + consumerHandle = portletHandle; + } + } + PerformBlockingInteraction action = WSRPTypeFactory.createDefaultPerformBlockingInteraction(generatorHandle); + List<NamedString> formParameters = action.getInteractionParams().getFormParameters(); + formParameters.add(namedString); + BlockingInteractionResponse actionResponse = producer.performBlockingInteraction(action); + GetMarkup markupRequestConsumer = createMarkupRequest(consumerHandle); + markupRequestConsumer.getMarkupParams().setNavigationalContext(actionResponse.getUpdateResponse().getNavigationalContext()); + MarkupResponse response = producer.getMarkup(markupRequestConsumer); + checkMarkupResponse(response, "Prabhat"); } finally { undeploy(archive); } - } - + }*/ + @Test public void testGetMarkupWithSimpleEvent() throws Exception { @@ -780,27 +781,28 @@ NamedString namedString = createNamedString("parameter", "param-value"); try { - List<String> handles = getHandlesForCurrentlyDeployedArchive(); - String generatorHandle = null; - String consumerHandle = null; - for (String portletHandle : handles) - { - if (portletHandle.contains("Generator")) - { - generatorHandle = portletHandle; - } else if (portletHandle.contains("Consumer")) - { - consumerHandle = portletHandle; - } - } - PerformBlockingInteraction action = WSRPTypeFactory.createDefaultPerformBlockingInteraction(generatorHandle); - List<NamedString> formParameters = action.getInteractionParams().getFormParameters(); - formParameters.add(namedString); - BlockingInteractionResponse actionResponse = producer.performBlockingInteraction(action); - GetMarkup markupRequestConsumer = createMarkupRequest(consumerHandle); - markupRequestConsumer.getMarkupParams().setNavigationalContext(actionResponse.getUpdateResponse().getNavigationalContext()); - MarkupResponse response = producer.getMarkup(markupRequestConsumer); - checkMarkupResponse(response, "param-value"); + List<String> handles = getHandlesForCurrentlyDeployedArchive(); + String generatorHandle = null; + String consumerHandle = null; + for (String portletHandle : handles) + { + if (portletHandle.contains("Generator")) + { + generatorHandle = portletHandle; + } + else if (portletHandle.contains("Consumer")) + { + consumerHandle = portletHandle; + } + } + PerformBlockingInteraction action = WSRPTypeFactory.createDefaultPerformBlockingInteraction(generatorHandle); + List<NamedString> formParameters = action.getInteractionParams().getFormParameters(); + formParameters.add(namedString); + BlockingInteractionResponse actionResponse = producer.performBlockingInteraction(action); + GetMarkup markupRequestConsumer = createMarkupRequest(consumerHandle); + markupRequestConsumer.getMarkupParams().setNavigationalContext(actionResponse.getUpdateResponse().getNavigationalContext()); + MarkupResponse response = producer.getMarkup(markupRequestConsumer); + checkMarkupResponse(response, "param-value"); } finally {