You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2015/03/13 21:45:34 UTC
[18/50] wicket git commit: WICKET-5840 WicketTester doesn't support
#clickLink() for ExternalLink component
WICKET-5840 WicketTester doesn't support #clickLink() for ExternalLink component
(cherry picked from commit 7613966c966aa1c46a04b5414eb5e016fb1009cb)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/eb829c68
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/eb829c68
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/eb829c68
Branch: refs/heads/pr-86-media_tags
Commit: eb829c685439e38503af9057e172a6d3a40169c9
Parents: fb833b5
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Feb 26 10:48:54 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Feb 26 10:51:12 2015 +0200
----------------------------------------------------------------------
.../wicket/util/tester/BaseWicketTester.java | 16 ++++++++
.../WicketTesterClickExternalLinkTest.java | 41 ++++++++++++++++++++
2 files changed, 57 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/eb829c68/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
index cc1f6c5..b153aba 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
@@ -85,6 +85,7 @@ import org.apache.wicket.markup.html.form.IFormSubmitListener;
import org.apache.wicket.markup.html.form.SubmitLink;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.markup.html.link.ILinkListener;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.link.ResourceLink;
@@ -1865,6 +1866,21 @@ public class BaseWicketTester
serializeFormToRequest(submitLink.getForm());
submitForm(submitLink.getForm().getPageRelativePath());
}
+ else if (linkComponent instanceof ExternalLink)
+ {
+ ExternalLink externalLink = (ExternalLink) linkComponent;
+ String href = externalLink.getDefaultModelObjectAsString();
+ try
+ {
+ getResponse().sendRedirect(href);
+ recordRequestResponse();
+ setupNextRequestCycle();
+ }
+ catch (IOException iox)
+ {
+ throw new WicketRuntimeException("An error occurred while redirecting to: " + href, iox);
+ }
+ }
// if the link is a normal link (or ResourceLink)
else if (linkComponent instanceof AbstractLink)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/eb829c68/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterClickExternalLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterClickExternalLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterClickExternalLinkTest.java
new file mode 100644
index 0000000..07ca15a
--- /dev/null
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterClickExternalLinkTest.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.util.tester;
+
+import org.apache.wicket.MockPageWithLink;
+import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.markup.html.link.ExternalLink;
+import org.junit.Test;
+
+/**
+ * Test for https://issues.apache.org/jira/browse/WICKET-5840
+ */
+public class WicketTesterClickExternalLinkTest extends WicketTestCase
+{
+ @Test
+ public void clickExternalLink()
+ {
+ MockPageWithLink page = new MockPageWithLink();
+ String href = "http://wicket.apache.org";
+ page.add(new ExternalLink(MockPageWithLink.LINK_ID, href, "Wicket site"));
+
+ tester.startPage(page);
+ tester.clickLink(MockPageWithLink.LINK_ID, false);
+
+ tester.assertRedirectUrl(href);
+ }
+}