Author: [email protected]
Date: Thu Sep 15 13:57:00 2011
New Revision: 1375
Log:
AMDATU-412 Switch port per test to avoid bind exceptions on linux
Modified:
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/AceClientTest.java
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/AceClientWorkspaceTest.java
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateRequestAction.java
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateResourceCollectionGet.java
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateResourceCreate.java
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateResourceDelete.java
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateWorkspaceCommit.java
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateWorkspaceCreate.java
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateWorkspaceRemove.java
Modified:
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/AceClientTest.java
==============================================================================
---
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/AceClientTest.java
(original)
+++
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/AceClientTest.java
Thu Sep 15 13:57:00 2011
@@ -42,13 +42,14 @@
public final static String SCHEME = "http";
public final static String HOST = "localhost";
- public final static int PORT = 9111;
public final static String CLIENT_PATH = "/client/work";
- public final static String CLIENT_ENDPOINT = SCHEME + "://" + HOST + ":" +
PORT + "" + CLIENT_PATH;
-
public final static String WORKSPACE_NAME = "rest-1";
- public final static String WORKSPACE_PATH = CLIENT_PATH + "/" +
WORKSPACE_NAME;
- public final static String WORKSPACE_ENDPOINT = SCHEME + "://" + HOST +
":" + PORT + WORKSPACE_PATH;
+
+ private static int m_startport = 9200;
+
+ private int getNextPort() {
+ return ++m_startport;
+ }
/**
* Simple test on the client and workspace life cycle.
@@ -58,6 +59,8 @@
@Test
public void testAceClientConnect() throws Exception {
+ final int port = getNextPort();
+
Mockery mockeryContext = new Mockery();
final Handler aceClientServerHandler =
mockeryContext.mock(Handler.class);
@@ -66,23 +69,23 @@
oneOf(aceClientServerHandler).handle(with(aNonNull(String.class)),
with(aNonNull(HttpServletRequest.class)),
with(aNonNull(HttpServletResponse.class)),
with(aNonNull(int.class)));
- will(new ValidateWorkspaceCreate());
+ will(new ValidateWorkspaceCreate(SCHEME, HOST, port,
CLIENT_PATH, WORKSPACE_NAME));
one(aceClientServerHandler).handle(with(aNonNull(String.class)),
with(aNonNull(HttpServletRequest.class)),
with(aNonNull(HttpServletResponse.class)),
with(aNonNull(int.class)));
- will(new ValidateWorkspaceCommit());
+ will(new ValidateWorkspaceCommit(SCHEME, HOST, port,
CLIENT_PATH, WORKSPACE_NAME));
one(aceClientServerHandler).handle(with(aNonNull(String.class)),
with(aNonNull(HttpServletRequest.class)),
with(aNonNull(HttpServletResponse.class)),
with(aNonNull(int.class)));
- will(new ValidateWorkspaceRemove());
+ will(new ValidateWorkspaceRemove(SCHEME, HOST, port,
CLIENT_PATH, WORKSPACE_NAME));
}
});
- SimpleHttpServer server = new SimpleHttpServer(PORT,
aceClientServerHandler);
+ SimpleHttpServer server = new SimpleHttpServer(port,
aceClientServerHandler);
server.startServer();
try {
- AceClient c = new AceClient(CLIENT_ENDPOINT);
+ AceClient c = new AceClient(SCHEME + "://" + HOST + ":" + port +
"" + CLIENT_PATH);
AceClientWorkspace w = c.createNewWorkspace();
Assert.assertNotNull(w);
w.commit();
@@ -117,7 +120,6 @@
in.close();
String json = builder.toString();
- AceClient c = new AceClient(CLIENT_ENDPOINT);
Model m = AceClientUtil.fromJson(json, Model.class);
Assert.assertNotNull(m);
Assert.assertEquals(27, m.getResources(Artifact.class).length);
Modified:
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/AceClientWorkspaceTest.java
==============================================================================
---
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/AceClientWorkspaceTest.java
(original)
+++
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/AceClientWorkspaceTest.java
Thu Sep 15 13:57:00 2011
@@ -15,9 +15,6 @@
*/
package org.amdatu.ace.client;
-import static org.amdatu.ace.client.AceClientTest.CLIENT_ENDPOINT;
-import static org.amdatu.ace.client.AceClientTest.PORT;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -42,9 +39,22 @@
*/
public class AceClientWorkspaceTest {
+ public final static String SCHEME = "http";
+ public final static String HOST = "localhost";
+ public final static String CLIENT_PATH = "/client/work";
+ public final static String WORKSPACE_NAME = "rest-1";
+
+ private static int m_startport = 9210;
+
+ private int getNextPort() {
+ return ++m_startport;
+ }
+
@Test
public void testCreateResource() throws Exception {
+ final int port = getNextPort();
+
final Artifact artifact = new ArtifactBuilder()
.isBundle()
.setUrl("some://url")
@@ -65,18 +75,18 @@
oneOf(aceClientServerHandler).handle(with(aNonNull(String.class)),
with(aNonNull(HttpServletRequest.class)),
with(aNonNull(HttpServletResponse.class)),
with(aNonNull(int.class)));
- will(new ValidateWorkspaceCreate());
+ will(new ValidateWorkspaceCreate(SCHEME, HOST, port,
CLIENT_PATH, WORKSPACE_NAME));
oneOf(aceClientServerHandler).handle(with(aNonNull(String.class)),
with(aNonNull(HttpServletRequest.class)),
with(aNonNull(HttpServletResponse.class)),
with(aNonNull(int.class)));
- will(new ValidateResourceCreate(artifact));
+ will(new ValidateResourceCreate(SCHEME, HOST, port,
CLIENT_PATH, WORKSPACE_NAME, artifact));
}
});
- SimpleHttpServer server = new SimpleHttpServer(PORT,
aceClientServerHandler);
+ SimpleHttpServer server = new SimpleHttpServer(port,
aceClientServerHandler);
server.startServer();
try {
- AceClient client = new AceClient(CLIENT_ENDPOINT);
+ AceClient client = new AceClient(SCHEME + "://" + HOST + ":" +
port + "" + CLIENT_PATH);
AceClientWorkspace w = client.createNewWorkspace();
Assert.assertNotNull(w);
@@ -92,6 +102,8 @@
@Test
public void testDeleteResource() throws Exception {
+ final int port = getNextPort();
+
final Class<? extends AbstractResource> artifactClass = Artifact.class;
final String artifactId = "someArtifactID";
@@ -102,18 +114,19 @@
oneOf(aceClientServerHandler).handle(with(aNonNull(String.class)),
with(aNonNull(HttpServletRequest.class)),
with(aNonNull(HttpServletResponse.class)),
with(aNonNull(int.class)));
- will(new ValidateWorkspaceCreate());
+ will(new ValidateWorkspaceCreate(SCHEME, HOST, port,
CLIENT_PATH, WORKSPACE_NAME));
oneOf(aceClientServerHandler).handle(with(aNonNull(String.class)),
with(aNonNull(HttpServletRequest.class)),
with(aNonNull(HttpServletResponse.class)),
with(aNonNull(int.class)));
- will(new ValidateResourceDelete(artifactClass, artifactId));
+ will(new ValidateResourceDelete(SCHEME, HOST, port,
CLIENT_PATH, WORKSPACE_NAME, artifactClass,
+ artifactId));
}
});
- SimpleHttpServer server = new SimpleHttpServer(PORT,
aceClientServerHandler);
+ SimpleHttpServer server = new SimpleHttpServer(port,
aceClientServerHandler);
server.startServer();
try {
- AceClient client = new AceClient(CLIENT_ENDPOINT);
+ AceClient client = new AceClient(SCHEME + "://" + HOST + ":" +
port + "" + CLIENT_PATH);
AceClientWorkspace w = client.createNewWorkspace();
Assert.assertNotNull(w);
w.deleteResource(Artifact.class, artifactId);
@@ -126,6 +139,9 @@
@Test
public void testGetResources() throws Exception {
+
+ final int port = getNextPort();
+
Mockery mockeryContext = new Mockery();
final Handler aceClientServerHandler =
mockeryContext.mock(Handler.class);
mockeryContext.checking(new Expectations() {
@@ -133,18 +149,19 @@
oneOf(aceClientServerHandler).handle(with(aNonNull(String.class)),
with(aNonNull(HttpServletRequest.class)),
with(aNonNull(HttpServletResponse.class)),
with(aNonNull(int.class)));
- will(new ValidateWorkspaceCreate());
+ will(new ValidateWorkspaceCreate(SCHEME, HOST, port,
CLIENT_PATH, WORKSPACE_NAME));
oneOf(aceClientServerHandler).handle(with(aNonNull(String.class)),
with(aNonNull(HttpServletRequest.class)),
with(aNonNull(HttpServletResponse.class)),
with(aNonNull(int.class)));
- will(new ValidateResourceCollectionGet("artifact", "[]"));
+ will(new ValidateResourceCollectionGet(SCHEME, HOST, port,
CLIENT_PATH, WORKSPACE_NAME, "artifact",
+ "[]"));
}
});
- SimpleHttpServer server = new SimpleHttpServer(PORT,
aceClientServerHandler);
+ SimpleHttpServer server = new SimpleHttpServer(port,
aceClientServerHandler);
server.startServer();
try {
- AceClient c = new AceClient(CLIENT_ENDPOINT);
+ AceClient c = new AceClient(SCHEME + "://" + HOST + ":" + port +
"" + CLIENT_PATH);
AceClientWorkspace w = c.createNewWorkspace();
Assert.assertNotNull(w);
Artifact[] artifacts = w.getResources(Artifact.class);
@@ -158,6 +175,9 @@
@Test
public void testWorkspaceExport() throws Exception {
+
+ final int port = getNextPort();
+
Mockery mockeryContext = new Mockery();
final Handler aceClientServerHandler =
mockeryContext.mock(Handler.class);
mockeryContext.checking(new Expectations() {
@@ -165,43 +185,48 @@
oneOf(aceClientServerHandler).handle(with(aNonNull(String.class)),
with(aNonNull(HttpServletRequest.class)),
with(aNonNull(HttpServletResponse.class)),
with(aNonNull(int.class)));
- will(new ValidateWorkspaceCreate());
+ will(new ValidateWorkspaceCreate(SCHEME, HOST, port,
CLIENT_PATH, WORKSPACE_NAME));
oneOf(aceClientServerHandler).handle(with(aNonNull(String.class)),
with(aNonNull(HttpServletRequest.class)),
with(aNonNull(HttpServletResponse.class)),
with(aNonNull(int.class)));
- will(new ValidateResourceCollectionGet("artifact", "[]"));
+ will(new ValidateResourceCollectionGet(SCHEME, HOST, port,
CLIENT_PATH, WORKSPACE_NAME, "artifact",
+ "[]"));
oneOf(aceClientServerHandler).handle(with(aNonNull(String.class)),
with(aNonNull(HttpServletRequest.class)),
with(aNonNull(HttpServletResponse.class)),
with(aNonNull(int.class)));
- will(new ValidateResourceCollectionGet("feature", "[]"));
+ will(new ValidateResourceCollectionGet(SCHEME, HOST, port,
CLIENT_PATH, WORKSPACE_NAME, "feature", "[]"));
oneOf(aceClientServerHandler).handle(with(aNonNull(String.class)),
with(aNonNull(HttpServletRequest.class)),
with(aNonNull(HttpServletResponse.class)),
with(aNonNull(int.class)));
- will(new ValidateResourceCollectionGet("distribution", "[]"));
+ will(new ValidateResourceCollectionGet(SCHEME, HOST, port,
CLIENT_PATH, WORKSPACE_NAME, "distribution",
+ "[]"));
oneOf(aceClientServerHandler).handle(with(aNonNull(String.class)),
with(aNonNull(HttpServletRequest.class)),
with(aNonNull(HttpServletResponse.class)),
with(aNonNull(int.class)));
- will(new ValidateResourceCollectionGet("target", "[]"));
+ will(new ValidateResourceCollectionGet(SCHEME, HOST, port,
CLIENT_PATH, WORKSPACE_NAME, "target", "[]"));
oneOf(aceClientServerHandler).handle(with(aNonNull(String.class)),
with(aNonNull(HttpServletRequest.class)),
with(aNonNull(HttpServletResponse.class)),
with(aNonNull(int.class)));
- will(new ValidateResourceCollectionGet("artifact2feature",
"[]"));
+ will(new ValidateResourceCollectionGet(SCHEME, HOST, port,
CLIENT_PATH, WORKSPACE_NAME,
+ "artifact2feature", "[]"));
oneOf(aceClientServerHandler).handle(with(aNonNull(String.class)),
with(aNonNull(HttpServletRequest.class)),
with(aNonNull(HttpServletResponse.class)),
with(aNonNull(int.class)));
- will(new ValidateResourceCollectionGet("feature2distribution",
"[]"));
+ will(new ValidateResourceCollectionGet(SCHEME, HOST, port,
CLIENT_PATH, WORKSPACE_NAME,
+ "feature2distribution", "[]"));
oneOf(aceClientServerHandler).handle(with(aNonNull(String.class)),
with(aNonNull(HttpServletRequest.class)),
with(aNonNull(HttpServletResponse.class)),
with(aNonNull(int.class)));
- will(new ValidateResourceCollectionGet("distribution2target",
"[]"));
+ will(new ValidateResourceCollectionGet(SCHEME, HOST, port,
CLIENT_PATH, WORKSPACE_NAME,
+ "distribution2target", "[]"));
}
});
- SimpleHttpServer server = new SimpleHttpServer(PORT,
aceClientServerHandler);
+ SimpleHttpServer server = new SimpleHttpServer(port,
aceClientServerHandler);
server.startServer();
try {
- AceClient c = new AceClient(CLIENT_ENDPOINT);
+ AceClient c = new AceClient(SCHEME + "://" + HOST + ":" + port +
"" + CLIENT_PATH);
AceClientWorkspace w = c.createNewWorkspace();
Assert.assertNotNull(w);
Model m = w.export();
Modified:
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateRequestAction.java
==============================================================================
---
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateRequestAction.java
(original)
+++
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateRequestAction.java
Thu Sep 15 13:57:00 2011
@@ -27,6 +27,20 @@
abstract class ValidateRequestAction<T> extends AbstractHandler implements
Action {
+ private final String m_scheme;
+ private final String m_host;
+ private final int m_port;
+ private final String m_clientpath;
+ private final String m_workspaceid;
+
+ public ValidateRequestAction(String scheme, String host, int port, String
clientpath, String workspaceid) {
+ m_scheme = scheme;
+ m_host = host;
+ m_port = port;
+ m_clientpath = clientpath;
+ m_workspaceid = workspaceid;
+ }
+
public void describeTo(Description description) {
description.appendText("Validates a HTTP request");
}
@@ -45,4 +59,36 @@
base_request.setHandled(true);
return null;
}
+
+ public String getScheme() {
+ return m_scheme;
+ }
+
+ public String getHost() {
+ return m_host;
+ }
+
+ public int getPort() {
+ return m_port;
+ }
+
+ public String getClientPath() {
+ return m_clientpath;
+ }
+
+ public String getWorkspaceId() {
+ return m_workspaceid;
+ }
+
+ public String getWorkspacePath() {
+ return getClientPath() + "/" + getWorkspaceId();
+ }
+
+ public String getClientEndpoint() {
+ return m_scheme + "://" + m_host + ":" + m_port + "" + m_clientpath;
+ }
+
+ public String getWorkspaceEndpoint() {
+ return getClientEndpoint() + "/" + m_workspaceid;
+ }
}
Modified:
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateResourceCollectionGet.java
==============================================================================
---
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateResourceCollectionGet.java
(original)
+++
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateResourceCollectionGet.java
Thu Sep 15 13:57:00 2011
@@ -15,8 +15,6 @@
*/
package org.amdatu.ace.client.test;
-import static org.amdatu.ace.client.AceClientTest.WORKSPACE_PATH;
-
import java.io.IOException;
import java.io.PrintWriter;
import java.net.HttpURLConnection;
@@ -34,7 +32,9 @@
private String m_collectionId;
private String m_responseBody;
- public ValidateResourceCollectionGet(String collectionId, String
respsonseBody) {
+ public ValidateResourceCollectionGet(String scheme, String host, int port,
String clientpath, String workspaceid,
+ String collectionId, String respsonseBody) {
+ super(scheme, host, port, clientpath, workspaceid);
m_collectionId = collectionId;
m_responseBody = respsonseBody;
}
@@ -46,7 +46,7 @@
public void handle(String target, HttpServletRequest request,
HttpServletResponse response, int dispatch)
throws IOException, ServletException {
Assert.assertEquals(HttpMethods.GET, request.getMethod());
- Assert.assertEquals(WORKSPACE_PATH + "/" + m_collectionId,
request.getPathInfo());
+ Assert.assertEquals(getWorkspacePath() + "/" + m_collectionId,
request.getPathInfo());
response.setStatus(HttpURLConnection.HTTP_OK);
PrintWriter p = response.getWriter();
p.print(m_responseBody);
Modified:
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateResourceCreate.java
==============================================================================
---
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateResourceCreate.java
(original)
+++
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateResourceCreate.java
Thu Sep 15 13:57:00 2011
@@ -15,9 +15,6 @@
*/
package org.amdatu.ace.client.test;
-import static org.amdatu.ace.client.AceClientTest.WORKSPACE_ENDPOINT;
-import static org.amdatu.ace.client.AceClientTest.WORKSPACE_PATH;
-
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -39,7 +36,9 @@
private AbstractResource m_resource;
- public ValidateResourceCreate(AbstractResource expectedResource) {
+ public ValidateResourceCreate(String scheme, String host, int port, String
clientpath, String workspaceid,
+ AbstractResource expectedResource) {
+ super(scheme, host, port, clientpath, workspaceid);
m_resource = expectedResource;
}
@@ -53,7 +52,7 @@
String collection =
m_resource.getClass().getAnnotation(Resource.class).path();
Assert.assertEquals(HttpMethods.POST, request.getMethod());
- Assert.assertEquals(WORKSPACE_PATH + "/" + collection,
request.getPathInfo());
+ Assert.assertEquals(getWorkspacePath() + "/" + collection,
request.getPathInfo());
BufferedReader rd = new BufferedReader(new
InputStreamReader(request.getInputStream()));
StringBuffer buffer = new StringBuffer();
@@ -68,6 +67,6 @@
Assert.assertEquals("Submitted resource must be equal to expected
resource", m_resource, newResource);
response.setStatus(HttpURLConnection.HTTP_MOVED_TEMP);
- response.setHeader(HttpHeaders.LOCATION, WORKSPACE_ENDPOINT +
collection + "/artifact1");
+ response.setHeader(HttpHeaders.LOCATION, getWorkspaceEndpoint() +
collection + "/artifact1");
}
}
\ No newline at end of file
Modified:
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateResourceDelete.java
==============================================================================
---
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateResourceDelete.java
(original)
+++
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateResourceDelete.java
Thu Sep 15 13:57:00 2011
@@ -15,8 +15,6 @@
*/
package org.amdatu.ace.client.test;
-import static org.amdatu.ace.client.AceClientTest.WORKSPACE_PATH;
-
import java.io.IOException;
import java.net.HttpURLConnection;
@@ -35,7 +33,9 @@
private final Class<? extends AbstractResource> m_resourceClass;
private final String m_resourceId;
- public ValidateResourceDelete(Class<? extends AbstractResource>
resourceClass, String resourceId) {
+ public ValidateResourceDelete(String scheme, String host, int port, String
clientpath, String workspaceid,
+ Class<? extends AbstractResource> resourceClass, String resourceId) {
+ super(scheme, host, port, clientpath, workspaceid);
m_resourceClass = resourceClass;
m_resourceId = resourceId;
}
@@ -50,7 +50,7 @@
String collection =
m_resourceClass.getAnnotation(Resource.class).path();
Assert.assertEquals(HttpMethods.DELETE, request.getMethod());
- Assert.assertEquals(WORKSPACE_PATH + "/" + collection + "/" +
m_resourceId, request.getPathInfo());
+ Assert.assertEquals(getWorkspacePath() + "/" + collection + "/" +
m_resourceId, request.getPathInfo());
response.setStatus(HttpURLConnection.HTTP_OK);
}
Modified:
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateWorkspaceCommit.java
==============================================================================
---
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateWorkspaceCommit.java
(original)
+++
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateWorkspaceCommit.java
Thu Sep 15 13:57:00 2011
@@ -15,8 +15,6 @@
*/
package org.amdatu.ace.client.test;
-import static org.amdatu.ace.client.AceClientTest.WORKSPACE_PATH;
-
import java.io.IOException;
import java.net.HttpURLConnection;
@@ -30,6 +28,10 @@
public class ValidateWorkspaceCommit extends ValidateRequestAction<Object> {
+ public ValidateWorkspaceCommit(String scheme, String host, int port,
String clientpath, String workspaceid) {
+ super(scheme, host, port, clientpath, workspaceid);
+ }
+
public void describeTo(Description description) {
description.appendText("Validates correctness of a HTTP request for
committing an Ace Client workspace");
}
@@ -37,7 +39,7 @@
public void handle(String target, HttpServletRequest request,
HttpServletResponse response, int dispatch)
throws IOException, ServletException {
Assert.assertEquals(HttpMethods.POST, request.getMethod());
- Assert.assertEquals(WORKSPACE_PATH, request.getPathInfo());
+ Assert.assertEquals(getWorkspacePath(), request.getPathInfo());
response.setStatus(HttpURLConnection.HTTP_OK);
}
}
\ No newline at end of file
Modified:
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateWorkspaceCreate.java
==============================================================================
---
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateWorkspaceCreate.java
(original)
+++
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateWorkspaceCreate.java
Thu Sep 15 13:57:00 2011
@@ -15,9 +15,6 @@
*/
package org.amdatu.ace.client.test;
-import static org.amdatu.ace.client.AceClientTest.CLIENT_PATH;
-import static org.amdatu.ace.client.AceClientTest.WORKSPACE_ENDPOINT;
-
import java.io.IOException;
import java.net.HttpURLConnection;
@@ -32,6 +29,10 @@
public class ValidateWorkspaceCreate extends ValidateRequestAction<Object> {
+ public ValidateWorkspaceCreate(String scheme, String host, int port,
String path, String workspace) {
+ super(scheme, host, port, path, workspace);
+ }
+
public void describeTo(Description description) {
description.appendText("Validates correctness of a HTTP request for
creating an Ace Client workspace");
}
@@ -39,8 +40,8 @@
public void handle(String target, HttpServletRequest request,
HttpServletResponse response, int dispatch)
throws IOException, ServletException {
Assert.assertEquals(HttpMethods.POST, request.getMethod());
- Assert.assertEquals(CLIENT_PATH, request.getPathInfo());
+ Assert.assertEquals(getClientPath(), request.getPathInfo());
response.setStatus(HttpURLConnection.HTTP_MOVED_TEMP);
- response.setHeader(HttpHeaders.LOCATION, WORKSPACE_ENDPOINT);
+ response.setHeader(HttpHeaders.LOCATION, getWorkspaceEndpoint());
}
}
\ No newline at end of file
Modified:
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateWorkspaceRemove.java
==============================================================================
---
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateWorkspaceRemove.java
(original)
+++
trunk/amdatu-ace-client/src/test/java/org/amdatu/ace/client/test/ValidateWorkspaceRemove.java
Thu Sep 15 13:57:00 2011
@@ -15,8 +15,6 @@
*/
package org.amdatu.ace.client.test;
-import static org.amdatu.ace.client.AceClientTest.WORKSPACE_PATH;
-
import java.io.IOException;
import java.net.HttpURLConnection;
@@ -30,6 +28,10 @@
public class ValidateWorkspaceRemove extends ValidateRequestAction<Object> {
+ public ValidateWorkspaceRemove(String scheme, String host, int port,
String clientpath, String workspaceid) {
+ super(scheme, host, port, clientpath, workspaceid);
+ }
+
public void describeTo(Description description) {
description.appendText("Validates correctness of a HTTP request for
removing an Ace Client workspace");
}
@@ -37,7 +39,7 @@
public void handle(String target, HttpServletRequest request,
HttpServletResponse response, int dispatch)
throws IOException, ServletException {
Assert.assertEquals(HttpMethods.DELETE, request.getMethod());
- Assert.assertEquals(WORKSPACE_PATH, request.getPathInfo());
+ Assert.assertEquals(getWorkspacePath(), request.getPathInfo());
response.setStatus(HttpURLConnection.HTTP_OK);
}
}
\ No newline at end of file
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
