From ded8c8f491205bc9806d30464d8f9f78a5160ea0 Mon Sep 17 00:00:00 2001
From: Nils-Helge Garli <nilsga@apache.org>
Date: Fri, 16 Nov 2007 07:11:07 +0000
Subject: [PATCH] Enabling the tests, trying a new strategy for locating a free
 port.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@595584 13f79535-47bb-0310-9956-ffa450edef68
---
 apps/portlet/pom.xml                              | 15 ---------------
 .../struts2/portlet/test/BasePortletTest.java     | 15 +++++++++------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index 2ef93f7e0..15ac1486c 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -40,21 +40,6 @@
        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/portlet/</url>
     </scm>
 	
-	<build>
-		<plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <!-- Excluded so the integration tests don't run in the main Bamboo build -->
-                    <excludes>
-						   <exclude>org/apache/struts2/portlet/test/*</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-		</plugins>
-	</build>
-	
 	<profiles>
 		<profile>
 			<id>pluto</id>
diff --git a/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java b/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java
index 1c7e76c44..d2cb12c89 100644
--- a/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java
+++ b/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java
@@ -10,11 +10,11 @@ import org.mortbay.jetty.webapp.WebAppContext;
 public abstract class BasePortletTest extends WebTestCase {
 	
 	protected Server server;
-
-	private int port = 9876;
 	
 	private String contextPath = "/test";
 	
+	private int port;
+	
 	public void setUp() throws Exception {
 		System.setProperty("org.apache.pluto.embedded.portletId", getPortletName());
 		server = new Server(port);
@@ -26,6 +26,9 @@ public abstract class BasePortletTest extends WebTestCase {
 		webapp.addServlet(portletServlet, "/PlutoInvoker/" + getPortletName());
 		server.addHandler(webapp);
 		server.start();
+		// Retrieve the actual port that is used, in case a random, free port is
+		// picked
+		int port = server.getConnectors()[0].getLocalPort();
 		getTestContext().setBaseUrl("http://localhost:" + port + contextPath);
 	}
 	
@@ -58,10 +61,6 @@ public abstract class BasePortletTest extends WebTestCase {
 		clickElementByXPath("//span[@class='help']/..");
 	}
 	
-	public void setPort(int port) {
-		this.port = port;
-	}
-	
 	public void setContextPath(String contextPath) {
 		if(!contextPath.startsWith("/")) {
 			this.contextPath = "/" + contextPath;
@@ -71,5 +70,9 @@ public abstract class BasePortletTest extends WebTestCase {
 		}
 	}
 	
+	public void setPort(int port) {
+		this.port = port;
+	}
+	
 	public abstract String getPortletName();
 }