Avoid using fixed TCP port numbers in unit tests.
git-svn-id: https://svn.apache.org/repos/asf/abdera/java/trunk@1444390 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/extensions/opensearch/pom.xml b/extensions/opensearch/pom.xml
index 6c12aa3..e264ad0 100644
--- a/extensions/opensearch/pom.xml
+++ b/extensions/opensearch/pom.xml
@@ -73,6 +73,11 @@
<artifactId>abdera-extensions-json</artifactId>
<version>1.2-SNAPSHOT</version>
<scope>test</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-testutils</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/extensions/opensearch/src/test/java/org/apache/abdera/test/ext/opensearch/server/processors/OpenSearchUrlRequestProcessorTest.java b/extensions/opensearch/src/test/java/org/apache/abdera/test/ext/opensearch/server/processors/OpenSearchUrlRequestProcessorTest.java
index 6402ad7..0db2e69 100644
--- a/extensions/opensearch/src/test/java/org/apache/abdera/test/ext/opensearch/server/processors/OpenSearchUrlRequestProcessorTest.java
+++ b/extensions/opensearch/src/test/java/org/apache/abdera/test/ext/opensearch/server/processors/OpenSearchUrlRequestProcessorTest.java
@@ -40,18 +40,23 @@
import org.apache.abdera.protocol.server.impl.RouteManager;
import org.apache.abdera.test.ext.opensearch.server.AbstractOpenSearchServerTest;
import org.apache.abdera.test.ext.opensearch.server.JettyServer;
+import org.apache.axiom.testutils.PortAllocator;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
public class OpenSearchUrlRequestProcessorTest extends AbstractOpenSearchServerTest {
- private JettyServer server = new JettyServer();
+ private int port;
+ private JettyServer server;
private OpenSearchInfo osInfo;
private OpenSearchUrlRequestProcessor osUrlProcessor;
@Before
public void setUp() throws Exception {
+ port = PortAllocator.allocatePort();
+ server = new JettyServer(port);
+
this.osInfo = this.createOpenSearchInfo();
((SimpleOpenSearchUrlInfo)osInfo.getUrls()[0]).setOpenSearchUrlAdapter(new TestingOpenSearchUrlAdapter1());
((SimpleOpenSearchUrlInfo)osInfo.getUrls()[1]).setOpenSearchUrlAdapter(new TestingOpenSearchUrlAdapter2());
@@ -94,10 +99,10 @@
AbderaClient client = new AbderaClient();
ClientResponse response = null;
// Test with first adapter:
- response = client.get("http://localhost:9002/search1?q=test1&c=1");
+ response = client.get("http://localhost:" + port + "/search1?q=test1&c=1");
assertEquals(200, response.getStatus());
// Test with second adapter:
- client.get("http://localhost:9002/search2?q=test2&c=1");
+ client.get("http://localhost:" + port + "/search2?q=test2&c=1");
assertEquals(200, response.getStatus());
}
@@ -106,7 +111,7 @@
AbderaClient client = new AbderaClient();
ClientResponse response = null;
// No adapter found for this Open Search url:
- response = client.get("http://localhost:9002/search3?q=test1&c=1");
+ response = client.get("http://localhost:" + port + "/search3?q=test1&c=1");
assertEquals(404, response.getStatus());
}
diff --git a/pom.xml b/pom.xml
index 0d45078..8cd26fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -401,6 +401,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-testutils</artifactId>
+ <version>1.2.15-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<version>3.2.6</version>
