You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2016/10/21 03:58:26 UTC
wicket git commit: WICKET-6257 testing the mapping to a page after a
conversation is marked as long-running
Repository: wicket
Updated Branches:
refs/heads/WICKET-6257-URL-cid-parameter [created] 48e39e9ac
WICKET-6257 testing the mapping to a page after a conversation is marked as long-running
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/48e39e9a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/48e39e9a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/48e39e9a
Branch: refs/heads/WICKET-6257-URL-cid-parameter
Commit: 48e39e9ac375f22c36d778ed152b8bd10afd477b
Parents: c5bb610
Author: Pedro Henrique Oliveira dos Santos <pe...@apache.org>
Authored: Fri Oct 21 01:55:30 2016 -0200
Committer: Pedro Henrique Oliveira dos Santos <pe...@apache.org>
Committed: Fri Oct 21 01:55:30 2016 -0200
----------------------------------------------------------------------
.../wicket/cdi/ConversationPropagatorTest.java | 50 ++++++++++++++++++++
.../cdi/testapp/TestConversationPage.java | 2 +
2 files changed, 52 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/48e39e9a/wicket-cdi-1.1/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java
----------------------------------------------------------------------
diff --git a/wicket-cdi-1.1/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java b/wicket-cdi-1.1/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java
index eefebde..3d18322 100644
--- a/wicket-cdi-1.1/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java
+++ b/wicket-cdi-1.1/src/test/java/org/apache/wicket/cdi/ConversationPropagatorTest.java
@@ -16,9 +16,14 @@
*/
package org.apache.wicket.cdi;
+import javax.enterprise.context.Conversation;
+import javax.inject.Inject;
+
import org.apache.wicket.cdi.testapp.TestConversationPage;
import org.apache.wicket.cdi.testapp.TestConversationalPage;
+import org.apache.wicket.core.request.mapper.MountedMapper;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.hamcrest.CoreMatchers;
import org.junit.Test;
/**
@@ -26,6 +31,9 @@ import org.junit.Test;
*/
public class ConversationPropagatorTest extends WicketCdiTestCase
{
+ @Inject
+ Conversation conversation;
+
@Test
public void testAutoConversationNonBookmarkable()
{
@@ -89,6 +97,47 @@ public class ConversationPropagatorTest extends WicketCdiTestCase
}
@Test
+ public void testPropagationAllHybrid()
+ {
+ configure(new CdiConfiguration().setPropagation(ConversationPropagation.ALL));
+ tester.getApplication().getRootRequestMapperAsCompound().add(new MountedMapper("segment", TestConversationPage.class));
+
+ tester.startPage(TestConversationPage.class, new PageParameters().add("pageType", "hybrid"));
+
+ int i;
+ for (i = 0; i < 3; i++)
+ {
+ tester.assertCount(i);
+ tester.clickLink("increment");
+ }
+ tester.clickLink("next");
+ for (; i < 6; i++)
+ {
+ tester.assertCount(i);
+ tester.clickLink("increment");
+ }
+ }
+
+ /**
+ * https://issues.apache.org/jira/browse/WICKET-6257
+ */
+ @Test
+ public void testPropagationAllHybridRefresh()
+ {
+ configure(new CdiConfiguration().setPropagation(ConversationPropagation.ALL));
+ tester.getApplication().getRootRequestMapperAsCompound().add(new MountedMapper("segment", TestConversationPage.class));
+
+ tester.startPage(TestConversationPage.class, new PageParameters().add("pageType", "hybrid"));
+
+ String pageId = tester.getLastRenderedPage().getId();
+ String cid = conversation.getId();
+
+ tester.executeUrl("segment?"+pageId+"&pageType=hybrid&cid="+cid);
+
+ assertThat(tester.getLastRenderedPage().getId(), CoreMatchers.is(pageId));
+ }
+
+ @Test
public void testPropagationAllBookmarkable()
{
configure(new CdiConfiguration().setPropagation(ConversationPropagation.ALL));
@@ -149,4 +198,5 @@ public class ConversationPropagatorTest extends WicketCdiTestCase
tester.assertCount(1);
}
}
+
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/48e39e9a/wicket-cdi-1.1/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.java
----------------------------------------------------------------------
diff --git a/wicket-cdi-1.1/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.java b/wicket-cdi-1.1/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.java
index d421e39..c6cc8bc 100644
--- a/wicket-cdi-1.1/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.java
+++ b/wicket-cdi-1.1/src/test/java/org/apache/wicket/cdi/testapp/TestConversationPage.java
@@ -73,6 +73,8 @@ public class TestConversationPage extends WebPage
String pageType = parameters.get("pageType").toString("nonbookmarkable");
if ("bookmarkable".equals(pageType.toLowerCase()))
setResponsePage(TestNonConversationalPage.class);
+ else if ("hybrid".equals(pageType.toLowerCase()))
+ setResponsePage(TestConversationPage.this);
else
setResponsePage(new TestNonConversationalPage());
}