Author: rmannibucau
Date: Mon May 7 16:57:50 2012
New Revision: 1335124
URL: http://svn.apache.org/viewvc?rev=1335124&view=rev
Log:
fixing some test using arquillian system properties to get url (old way)
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/JaxrsTest.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/apppath/AnnotatedApplicationTest.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/basicapp/BasicAppilcationTest.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/httpheaders/JAXRSHttpHeadersTest.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/listed/ListedApplicationTest.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/noapp/NoAppTest.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/scanning/ScannedApplicationTest.java
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/JaxrsTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/JaxrsTest.java?rev=1335124&r1=1335123&r2=1335124&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/JaxrsTest.java
(original)
+++
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/JaxrsTest.java
Mon May 7 16:57:50 2012
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.arquillian.tests.jaxrs;
+import java.net.URL;
import junit.framework.Assert;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
@@ -28,11 +29,14 @@ import java.io.InputStream;
import java.net.URI;
import java.util.HashMap;
import java.util.Map;
+import org.jboss.arquillian.test.api.ArquillianResource;
/**
* @version $Rev$ $Date$
*/
public class JaxrsTest {
+ @ArquillianResource
+ private URL url;
protected HttpClient client = new DefaultHttpClient();
@@ -71,9 +75,7 @@ public class JaxrsTest {
}
protected URI uri(String path) {
- if (path.startsWith("/")) path = path.substring(1);
- final String port = System.getProperty("tomee.httpPort", "11080");
- return URI.create(String.format("http://localhost:%s/%s/%s";, port,
this.getClass().getSimpleName(), path));
+ return URI.create(String.format("%s%s", url.toExternalForm(), path));
}
public static void assertStatusCode(int actual, HttpResponse response) {
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/apppath/AnnotatedApplicationTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/apppath/AnnotatedApplicationTest.java?rev=1335124&r1=1335123&r2=1335124&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/apppath/AnnotatedApplicationTest.java
(original)
+++
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/apppath/AnnotatedApplicationTest.java
Mon May 7 16:57:50 2012
@@ -39,7 +39,7 @@ public class AnnotatedApplicationTest ex
@Test
public void invoke() throws Exception {
- Assert.assertEquals("olleh", get("/rest/echo/reverse/hello"));
+ Assert.assertEquals("olleh", get("rest/echo/reverse/hello"));
}
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/basicapp/BasicAppilcationTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/basicapp/BasicAppilcationTest.java?rev=1335124&r1=1335123&r2=1335124&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/basicapp/BasicAppilcationTest.java
(original)
+++
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/basicapp/BasicAppilcationTest.java
Mon May 7 16:57:50 2012
@@ -39,7 +39,7 @@ public class BasicAppilcationTest extend
@Test
public void invoke() throws Exception {
- Assert.assertEquals("olleh", get("/echo/reverse/hello"));
+ Assert.assertEquals("olleh", get("echo/reverse/hello"));
}
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/httpheaders/JAXRSHttpHeadersTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/httpheaders/JAXRSHttpHeadersTest.java?rev=1335124&r1=1335123&r2=1335124&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/httpheaders/JAXRSHttpHeadersTest.java
(original)
+++
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/httpheaders/JAXRSHttpHeadersTest.java
Mon May 7 16:57:50 2012
@@ -55,7 +55,7 @@ public class JAXRSHttpHeadersTest extend
*/
@Test
public void testAcceptableLanguagesNoneGiven() throws IOException {
- final String response =
get("/context/httpheaders/acceptablelanguages");
+ final String response = get("context/httpheaders/acceptablelanguages");
assertEquals("acceptablelanguages:", response);
}
@@ -68,7 +68,7 @@ public class JAXRSHttpHeadersTest extend
@Test
public void testAcceptableLanguagesOneGiven() throws IOException {
final Map<String, String> headers = headers("Accept-Language", "de");
- final String actual = get(headers,
"/context/httpheaders/acceptablelanguages");
+ final String actual = get(headers,
"context/httpheaders/acceptablelanguages");
assertEquals("acceptablelanguages:de:", actual);
}
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/listed/ListedApplicationTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/listed/ListedApplicationTest.java?rev=1335124&r1=1335123&r2=1335124&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/listed/ListedApplicationTest.java
(original)
+++
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/listed/ListedApplicationTest.java
Mon May 7 16:57:50 2012
@@ -41,7 +41,7 @@ public class ListedApplicationTest exten
@Test
public void invoke() throws Exception {
- Assert.assertEquals("olleh", get("/rest/echo/reverse/hello"));
+ Assert.assertEquals("olleh", get("rest/echo/reverse/hello"));
try {
get("/rest/unlisted/reverse/hello");
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/noapp/NoAppTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/noapp/NoAppTest.java?rev=1335124&r1=1335123&r2=1335124&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/noapp/NoAppTest.java
(original)
+++
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/noapp/NoAppTest.java
Mon May 7 16:57:50 2012
@@ -39,7 +39,7 @@ public class NoAppTest extends JaxrsTest
@Test
public void invoke() throws Exception {
- Assert.assertEquals("olleh", get("/echo/reverse/hello"));
+ Assert.assertEquals("olleh", get("echo/reverse/hello"));
}
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/scanning/ScannedApplicationTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/scanning/ScannedApplicationTest.java?rev=1335124&r1=1335123&r2=1335124&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/scanning/ScannedApplicationTest.java
(original)
+++
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/scanning/ScannedApplicationTest.java
Mon May 7 16:57:50 2012
@@ -39,7 +39,7 @@ public class ScannedApplicationTest exte
@Test
public void invoke() throws Exception {
// http://localhost:11080/ScannedApplicationTest/echo/.
- Assert.assertEquals("olleh", get("/rest/echo/reverse/hello"));
+ Assert.assertEquals("olleh", get("rest/echo/reverse/hello"));
}
