You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/08/02 15:42:32 UTC
git commit: Use random ports for the HttpUnit based tests
Updated Branches:
refs/heads/wicket-6.x 2159496e7 -> 6eaa945b3
Use random ports for the HttpUnit based tests
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6eaa945b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6eaa945b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6eaa945b
Branch: refs/heads/wicket-6.x
Commit: 6eaa945b3a9aa632c948a97b53cf2ac1db963712
Parents: 2159496
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Aug 2 15:41:24 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Aug 2 15:42:21 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/examples/JettyTestCaseDecorator.java | 5 +++--
.../test/java/org/apache/wicket/examples/WicketWebTestCase.java | 3 ++-
.../java/org/apache/wicket/filtertest/WithCPWithFPTest.java | 4 ++--
.../java/org/apache/wicket/filtertest/WithCPWithoutFPTest.java | 4 ++--
4 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6eaa945b/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java b/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java
index 503e3e4..7a4344f 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java
@@ -35,6 +35,7 @@ public class JettyTestCaseDecorator extends Assert
private Server server;
private String contextPath;
private String webappLocation;
+ protected int localPort;
/**
* @throws Exception
@@ -46,9 +47,8 @@ public class JettyTestCaseDecorator extends Assert
System.setProperty("wicket.configuration", "deployment");
- server = new Server();
+ server = new Server(0);
SelectChannelConnector connector = new SelectChannelConnector();
- connector.setPort(8098);
server.setConnectors(new Connector[] { connector });
WebAppContext web = new WebAppContext();
@@ -74,6 +74,7 @@ public class JettyTestCaseDecorator extends Assert
server.setHandler(web);
server.start();
+ localPort = connector.getLocalPort();
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/6eaa945b/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java b/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java
index dad49c6..46e42f9 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java
@@ -31,7 +31,7 @@ import org.junit.Before;
public abstract class WicketWebTestCase extends JettyTestCaseDecorator
{
/** The base url used to connect the conversation to */
- private String baseUrl = "http://localhost:8098/";
+ private String baseUrl;
/** The web conversation that keeps track of our requests. */
private WebConversation conversation;
@@ -52,6 +52,7 @@ public abstract class WicketWebTestCase extends JettyTestCaseDecorator
public void before() throws Exception
{
super.before();
+ setBaseUrl(String.format("http://localhost:%d/", localPort));
conversation = new WebConversation();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/6eaa945b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithFPTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithFPTest.java b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithFPTest.java
index 3f193ed..cb8c36a 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithFPTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithFPTest.java
@@ -32,8 +32,6 @@ public class WithCPWithFPTest extends WithoutCPWithFPTest
@Before
public void before() throws Exception
{
- setBaseUrl("http://localhost:8098/somecontext");
-
setContextPath("/somecontext");
String basedir = System.getProperty("basedir");
String path = "";
@@ -43,5 +41,7 @@ public class WithCPWithFPTest extends WithoutCPWithFPTest
setWebappLocation(path);
super.before();
+
+ setBaseUrl(String.format("http://localhost:%d/somecontext", localPort));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/6eaa945b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithoutFPTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithoutFPTest.java b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithoutFPTest.java
index bfe30ba..9eb625a 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithoutFPTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithCPWithoutFPTest.java
@@ -31,8 +31,6 @@ public class WithCPWithoutFPTest extends WithoutCPWithoutFPTest
@Before
public void before() throws Exception
{
- setBaseUrl("http://localhost:8098/somecontext");
-
setContextPath("/somecontext");
String basedir = System.getProperty("basedir");
String path = "";
@@ -42,5 +40,7 @@ public class WithCPWithoutFPTest extends WithoutCPWithoutFPTest
setWebappLocation(path);
super.before();
+
+ setBaseUrl(String.format("http://localhost:%d/somecontext", localPort));
}
}