You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/07/17 12:40:02 UTC
svn commit: r1611316 - in /tomee/tomee/trunk:
container/openejb-core/src/test/java/org/apache/openejb/util/
server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/
server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/
Author: andygumbrecht
Date: Thu Jul 17 10:40:01 2014
New Revision: 1611316
URL: http://svn.apache.org/r1611316
Log:
Test on available ports - Other builds may running.
Modified:
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/PoolTest.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/AdvancedProviderConfigTest.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ApplicationFromWebXmlTest.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CdiInterceptorContextTest.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CheckedExceptionMapperTest.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomContextTest.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomExceptionMapperTest.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderWithConfigTest.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DiscoverCustomProviderTest.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DynamicSubclassEjbDeploymentTest.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EJBAccessExceptionMapperTest.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EjbDeploymentTest.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSRoutingTest.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSWithInterfaceTest.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JndiForPojoEndpointsTest.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/MultipleApplicationsTest.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/NoPathOnImplTest.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/OptionsTest.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/PathParamAtClassLevelTest.java
tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiPojoTest.java
tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WebServiceWithAnUserInterceptorTest.java
tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WsJMXTest.java
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/PoolTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/PoolTest.java?rev=1611316&r1=1611315&r2=1611316&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/PoolTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/PoolTest.java Thu Jul 17 10:40:01 2014
@@ -33,6 +33,7 @@ import static java.util.concurrent.TimeU
/**
* @version $Rev$ $Date$
*/
+@SuppressWarnings({"unchecked", "StatementWithEmptyBody"})
public class PoolTest extends TestCase {
private Pool pool;
@@ -1300,7 +1301,7 @@ public class PoolTest extends TestCase {
// -- DONE --
}
- private void await(final CountDownLatch latch, final int timeout, final TimeUnit seconds) throws InterruptedException {
+ private static void await(final CountDownLatch latch, final int timeout, final TimeUnit seconds) throws InterruptedException {
if (!latch.await(timeout, seconds)) {
// String path = "<dump-failed>";
// try {
@@ -1313,21 +1314,21 @@ public class PoolTest extends TestCase {
}
}
- private <T> void checkMax(final int max, final List<Pool<T>.Entry> entries) {
+ private static <T> void checkMax(final int max, final List<Pool<T>.Entry> entries) {
assertEquals(max, entries.size());
}
- private <T> void checkMin(final int min, final List<Pool<T>.Entry> entries) {
+ private static <T> void checkMin(final int min, final List<Pool<T>.Entry> entries) {
assertEquals(min, getMin(entries).size());
}
- private <T> void checkNull(final List<Pool<T>.Entry> entries) {
+ private static <T> void checkNull(final List<Pool<T>.Entry> entries) {
for (final Pool<T>.Entry entry : entries) {
assertNull(entry);
}
}
- private <T> List<Pool<T>.Entry> getMin(final List<Pool<T>.Entry> entries) {
+ private static <T> List<Pool<T>.Entry> getMin(final List<Pool<T>.Entry> entries) {
final List<Pool<T>.Entry> list = new ArrayList<Pool<T>.Entry>();
for (final Pool<T>.Entry entry : entries) {
@@ -1336,7 +1337,7 @@ public class PoolTest extends TestCase {
return list;
}
- private <T> void checkEntries(final int expected, final List<Pool<T>.Entry> entries) {
+ private static <T> void checkEntries(final int expected, final List<Pool<T>.Entry> entries) {
int found = 0;
for (final Pool<T>.Entry entry : entries) {
if (entry == null) continue;
@@ -1347,11 +1348,11 @@ public class PoolTest extends TestCase {
assertEquals(expected, found);
}
- private <T> List<Pool<T>.Entry> drain(final Pool<T> pool) throws InterruptedException {
+ private static <T> List<Pool<T>.Entry> drain(final Pool<T> pool) throws InterruptedException {
return drain(pool, 0);
}
- private <T> List<Pool<T>.Entry> drain(final Pool<T> pool, final int timeout) throws InterruptedException {
+ private static <T> List<Pool<T>.Entry> drain(final Pool<T> pool, final int timeout) throws InterruptedException {
final List<Pool<T>.Entry> entries = new ArrayList<Pool<T>.Entry>();
try {
while (true) {
@@ -1363,7 +1364,7 @@ public class PoolTest extends TestCase {
return entries;
}
- public static class Bean {
+ public static final class Bean {
public static AtomicInteger instances = new AtomicInteger();
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/AdvancedProviderConfigTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/AdvancedProviderConfigTest.java?rev=1611316&r1=1611315&r2=1611316&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/AdvancedProviderConfigTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/AdvancedProviderConfigTest.java Thu Jul 17 10:40:01 2014
@@ -17,6 +17,7 @@
package org.apache.openejb.server.cxf.rs;
import org.apache.cxf.jaxrs.provider.JAXBElementProvider;
+import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.config.EjbModule;
import org.apache.openejb.config.sys.Resources;
import org.apache.openejb.config.sys.Service;
@@ -27,9 +28,13 @@ import org.apache.openejb.jee.oejb3.Open
import org.apache.openejb.jee.oejb3.PojoDeployment;
import org.apache.openejb.junit.ApplicationComposer;
import org.apache.openejb.loader.IO;
+import org.apache.openejb.testing.Configuration;
import org.apache.openejb.testing.EnableServices;
import org.apache.openejb.testing.Module;
+import org.apache.openejb.testng.PropertiesBuilder;
+import org.apache.openejb.util.NetworkUtil;
import org.apache.openejb.util.reflection.Reflections;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -44,12 +49,29 @@ import javax.xml.bind.ValidationEventHan
import javax.xml.bind.annotation.XmlRootElement;
import java.lang.annotation.Annotation;
import java.net.URL;
+import java.util.Properties;
import static org.junit.Assert.assertEquals;
@EnableServices("jax-rs")
@RunWith(ApplicationComposer.class)
public class AdvancedProviderConfigTest {
+
+ private static int port = -1;
+
+ @BeforeClass
+ public static void beforeClass() {
+ port = NetworkUtil.getNextAvailablePort();
+ }
+
+ @Configuration
+ public Properties props() {
+ return new PropertiesBuilder()
+ .p("httpejbd.port", Integer.toString(port))
+ .p(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true")
+ .build();
+ }
+
@Module
public static EjbModule service() throws Exception {
final EjbModule module = new EjbModule(new EjbJar(), new OpenejbJar());
@@ -79,7 +101,7 @@ public class AdvancedProviderConfigTest
@Test
public void check() throws Exception {
- assertEquals("true", IO.slurp(new URL("http://127.0.0.1:4204/AdvancedProviderConfigTest/advanced-provider-config/")));
+ assertEquals("true", IO.slurp(new URL("http://127.0.0.1:" + port + "/AdvancedProviderConfigTest/advanced-provider-config/")));
}
@Singleton
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ApplicationFromWebXmlTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ApplicationFromWebXmlTest.java?rev=1611316&r1=1611315&r2=1611316&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ApplicationFromWebXmlTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ApplicationFromWebXmlTest.java Thu Jul 17 10:40:01 2014
@@ -17,18 +17,24 @@
package org.apache.openejb.server.cxf.rs;
import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.jee.WebApp;
import org.apache.openejb.junit.ApplicationComposer;
import org.apache.openejb.server.cxf.rs.beans.MyFirstRestClass;
import org.apache.openejb.testing.Classes;
+import org.apache.openejb.testing.Configuration;
import org.apache.openejb.testing.EnableServices;
import org.apache.openejb.testing.Module;
+import org.apache.openejb.testng.PropertiesBuilder;
+import org.apache.openejb.util.NetworkUtil;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import javax.ws.rs.core.Application;
import java.util.Arrays;
import java.util.HashSet;
+import java.util.Properties;
import java.util.Set;
import static org.junit.Assert.assertEquals;
@@ -36,7 +42,21 @@ import static org.junit.Assert.assertEqu
@EnableServices("jax-rs")
@RunWith(ApplicationComposer.class)
public class ApplicationFromWebXmlTest {
- public static final String BASE_URL = "http://localhost:4204/foo/bar";
+
+ private static int port = -1;
+
+ @BeforeClass
+ public static void beforeClass() {
+ port = NetworkUtil.getNextAvailablePort();
+ }
+
+ @Configuration
+ public Properties props() {
+ return new PropertiesBuilder()
+ .p("httpejbd.port", Integer.toString(port))
+ .p(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true")
+ .build();
+ }
@Module
@Classes(value = {MyFirstRestClass.class}, cdi = true)
@@ -50,7 +70,7 @@ public class ApplicationFromWebXmlTest {
@Test
public void first() {
- final String hi = WebClient.create(BASE_URL).path("/first/hi").get(String.class);
+ final String hi = WebClient.create("http://localhost:" + port + "/foo/bar").path("/first/hi").get(String.class);
assertEquals("Hi from REST World!", hi);
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CdiInterceptorContextTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CdiInterceptorContextTest.java?rev=1611316&r1=1611315&r2=1611316&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CdiInterceptorContextTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CdiInterceptorContextTest.java Thu Jul 17 10:40:01 2014
@@ -17,11 +17,16 @@
package org.apache.openejb.server.cxf.rs;
import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.jee.WebApp;
import org.apache.openejb.junit.ApplicationComposer;
import org.apache.openejb.testing.Classes;
+import org.apache.openejb.testing.Configuration;
import org.apache.openejb.testing.EnableServices;
import org.apache.openejb.testing.Module;
+import org.apache.openejb.testng.PropertiesBuilder;
+import org.apache.openejb.util.NetworkUtil;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,6 +42,7 @@ import javax.ws.rs.core.Context;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import java.util.HashSet;
+import java.util.Properties;
import java.util.Set;
import static java.lang.annotation.ElementType.TYPE;
@@ -46,6 +52,22 @@ import static org.junit.Assert.assertEqu
@EnableServices("jax-rs")
@RunWith(ApplicationComposer.class)
public class CdiInterceptorContextTest {
+
+ private static int port = -1;
+
+ @BeforeClass
+ public static void beforeClass() {
+ port = NetworkUtil.getNextAvailablePort();
+ }
+
+ @Configuration
+ public Properties props() {
+ return new PropertiesBuilder()
+ .p("httpejbd.port", Integer.toString(port))
+ .p(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true")
+ .build();
+ }
+
@Module
@Classes(value = {Endpoint.class, AnswerPerfect.class}, cdiInterceptors = AnswerPerfect.class)
public WebApp war() {
@@ -57,7 +79,7 @@ public class CdiInterceptorContextTest {
@Test
public void checkServiceWasDeployed() {
- assertEquals("perfect", WebClient.create("http://localhost:4204/app").path("/foo").get(String.class));
+ assertEquals("perfect", WebClient.create("http://localhost:" + port + "/app").path("/foo").get(String.class));
}
@Path("/foo")
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CheckedExceptionMapperTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CheckedExceptionMapperTest.java?rev=1611316&r1=1611315&r2=1611316&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CheckedExceptionMapperTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CheckedExceptionMapperTest.java Thu Jul 17 10:40:01 2014
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.server.cxf.rs;
+import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.config.EjbModule;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.SingletonBean;
@@ -24,8 +25,12 @@ import org.apache.openejb.jee.oejb3.Open
import org.apache.openejb.junit.ApplicationComposer;
import org.apache.openejb.loader.IO;
import org.apache.openejb.testing.Classes;
+import org.apache.openejb.testing.Configuration;
import org.apache.openejb.testing.EnableServices;
import org.apache.openejb.testing.Module;
+import org.apache.openejb.testng.PropertiesBuilder;
+import org.apache.openejb.util.NetworkUtil;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -43,6 +48,22 @@ import static org.junit.Assert.assertEqu
@EnableServices("jaxrs")
@RunWith(ApplicationComposer.class)
public class CheckedExceptionMapperTest {
+
+ private static int port = -1;
+
+ @BeforeClass
+ public static void beforeClass() {
+ port = NetworkUtil.getNextAvailablePort();
+ }
+
+ @Configuration
+ public Properties props() {
+ return new PropertiesBuilder()
+ .p("httpejbd.port", Integer.toString(port))
+ .p(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true")
+ .build();
+ }
+
@Module
@Classes({ExampleExceptionMapper.class})
public EjbModule module() {
@@ -66,7 +87,7 @@ public class CheckedExceptionMapperTest
@Test
public void testThrowException() throws IOException {
- assertEquals("Exception!", IO.slurp(new URL("http://localhost:4204/CheckedExceptionMapperTest/example/throw/")));
+ assertEquals("Exception!", IO.slurp(new URL("http://localhost:" + port + "/CheckedExceptionMapperTest/example/throw/")));
}
public static class ExampleException extends Exception {
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomContextTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomContextTest.java?rev=1611316&r1=1611315&r2=1611316&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomContextTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomContextTest.java Thu Jul 17 10:40:01 2014
@@ -29,6 +29,9 @@ import org.apache.openejb.junit.Applicat
import org.apache.openejb.loader.IO;
import org.apache.openejb.testing.Configuration;
import org.apache.openejb.testing.Module;
+import org.apache.openejb.testng.PropertiesBuilder;
+import org.apache.openejb.util.NetworkUtil;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -45,6 +48,22 @@ import static org.junit.Assert.assertEqu
@RunWith(ApplicationComposer.class)
public class CustomContextTest {
+
+ private static int port = -1;
+
+ @BeforeClass
+ public static void beforeClass() {
+ port = NetworkUtil.getNextAvailablePort();
+ }
+
+ @Configuration
+ public Properties props() {
+ return new PropertiesBuilder()
+ .p("httpejbd.port", Integer.toString(port))
+ .p(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true")
+ .build();
+ }
+
@Module
public static EjbModule service() throws Exception {
final EjbModule module = new EjbModule(new EjbJar(), new OpenejbJar());
@@ -62,16 +81,9 @@ public class CustomContextTest {
return module;
}
- @Configuration
- public static Properties configuration() throws Exception {
- final Properties properties = new Properties();
- properties.setProperty(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true");
- return properties;
- }
-
@Test
public void rest() throws IOException {
- final String response = IO.slurp(new URL("http://127.0.0.1:4204/CustomContextTest/custom-context/check"));
+ final String response = IO.slurp(new URL("http://127.0.0.1:" + port + "/CustomContextTest/custom-context/check"));
assertEquals("true", response);
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomExceptionMapperTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomExceptionMapperTest.java?rev=1611316&r1=1611315&r2=1611316&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomExceptionMapperTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomExceptionMapperTest.java Thu Jul 17 10:40:01 2014
@@ -21,6 +21,7 @@ import org.apache.cxf.jaxrs.client.WebCl
import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.config.DeploymentFilterable;
import org.apache.openejb.config.DeploymentLoader;
+import org.apache.openejb.util.NetworkUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -36,14 +37,18 @@ import java.util.Properties;
import static org.junit.Assert.assertEquals;
public class CustomExceptionMapperTest {
+
private static EJBContainer container;
+ private static int port = -1;
@BeforeClass
public static void start() throws Exception {
+ port = NetworkUtil.getNextAvailablePort();
final Properties properties = new Properties();
properties.setProperty(DeploymentFilterable.CLASSPATH_INCLUDE, ".*openejb-cxf-rs.*");
properties.setProperty(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true");
properties.setProperty(DeploymentLoader.OPENEJB_ALTDD_PREFIX, "em");
+ properties.setProperty("httpejbd.port", Integer.toString(port));
container = EJBContainer.createEJBContainer(properties);
}
@@ -56,7 +61,7 @@ public class CustomExceptionMapperTest {
@Test
public void exceptionMapper() {
- final String response = WebClient.create("http://localhost:4204/openejb-cxf-rs")
+ final String response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs")
.path("/exception-mapper/throw").get(String.class);
assertEquals(FooException.class.getName(), response);
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java?rev=1611316&r1=1611315&r2=1611316&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java Thu Jul 17 10:40:01 2014
@@ -21,6 +21,7 @@ import org.apache.cxf.jaxrs.client.WebCl
import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.config.DeploymentFilterable;
import org.apache.openejb.config.DeploymentLoader;
+import org.apache.openejb.util.NetworkUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -44,13 +45,17 @@ import static org.junit.Assert.assertEqu
public class CustomProviderTest {
private static EJBContainer container;
+ private static int port = -1;
@BeforeClass
public static void start() throws Exception {
+ port = NetworkUtil.getNextAvailablePort();
final Properties properties = new Properties();
+ properties.setProperty("httpejbd.port", Integer.toString(port));
properties.setProperty(DeploymentFilterable.CLASSPATH_INCLUDE, ".*openejb-cxf-rs.*");
properties.setProperty(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true");
properties.setProperty(DeploymentLoader.OPENEJB_ALTDD_PREFIX, "custom");
+
container = EJBContainer.createEJBContainer(properties);
}
@@ -63,14 +68,14 @@ public class CustomProviderTest {
@Test
public void customProvider() {
- String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").accept("openejb/reverse")
+ final String response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").accept("openejb/reverse")
.path("/custom1/reverse").get(String.class);
assertEquals("provider", response);
}
@Test
public void customSpecificProvider() {
- String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").accept("openejb/constant")
+ final String response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").accept("openejb/constant")
.path("/custom2/constant").get(String.class);
assertEquals("it works!", response);
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderWithConfigTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderWithConfigTest.java?rev=1611316&r1=1611315&r2=1611316&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderWithConfigTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderWithConfigTest.java Thu Jul 17 10:40:01 2014
@@ -20,6 +20,7 @@ import org.apache.cxf.jaxrs.client.WebCl
import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.config.DeploymentFilterable;
import org.apache.openejb.config.DeploymentLoader;
+import org.apache.openejb.util.NetworkUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -43,13 +44,16 @@ import static org.junit.Assert.assertEqu
public class CustomProviderWithConfigTest {
private static EJBContainer container;
+ private static int port = -1;
@BeforeClass
public static void start() throws Exception {
+ port = NetworkUtil.getNextAvailablePort();
final Properties properties = new Properties();
properties.setProperty(DeploymentFilterable.CLASSPATH_INCLUDE, ".*openejb-cxf-rs.*");
properties.setProperty(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true");
properties.setProperty(DeploymentLoader.OPENEJB_ALTDD_PREFIX, "custom-config");
+ properties.setProperty("httpejbd.port", Integer.toString(port));
// cxf.jaxrs.properties = faultStackTraceEnabled=true
container = EJBContainer.createEJBContainer(properties);
}
@@ -63,7 +67,7 @@ public class CustomProviderWithConfigTes
@Test
public void config() {
- final String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").accept("openejb/conf")
+ final String response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").accept("openejb/conf")
.path("/customized/").get(String.class);
assertEquals("done!", response);
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DiscoverCustomProviderTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DiscoverCustomProviderTest.java?rev=1611316&r1=1611315&r2=1611316&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DiscoverCustomProviderTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DiscoverCustomProviderTest.java Thu Jul 17 10:40:01 2014
@@ -21,6 +21,7 @@ import org.apache.cxf.jaxrs.client.WebCl
import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.config.DeploymentFilterable;
import org.apache.openejb.server.rest.RESTService;
+import org.apache.openejb.util.NetworkUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -44,10 +45,13 @@ import static org.junit.Assert.assertEqu
public class DiscoverCustomProviderTest {
private static EJBContainer container;
+ private static int port = -1;
@BeforeClass
public static void start() throws Exception {
+ port = NetworkUtil.getNextAvailablePort();
final Properties properties = new Properties();
+ properties.setProperty("httpejbd.port", Integer.toString(port));
properties.setProperty(DeploymentFilterable.CLASSPATH_INCLUDE, ".*openejb-cxf-rs.*");
properties.setProperty(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true");
properties.setProperty(RESTService.OPENEJB_JAXRS_PROVIDERS_AUTO_PROP, "true");
@@ -64,7 +68,7 @@ public class DiscoverCustomProviderTest
@Test
public void customProvider() {
- final String response = WebClient.create("http://localhost:4204/openejb-cxf-rs")
+ final String response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs")
.accept("discover/reverse")
.path("the/service").get(String.class);
assertEquals("it rocks", response);
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DynamicSubclassEjbDeploymentTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DynamicSubclassEjbDeploymentTest.java?rev=1611316&r1=1611315&r2=1611316&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DynamicSubclassEjbDeploymentTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DynamicSubclassEjbDeploymentTest.java Thu Jul 17 10:40:01 2014
@@ -21,6 +21,7 @@ import org.apache.cxf.jaxrs.client.WebCl
import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.config.DeploymentFilterable;
import org.apache.openejb.server.cxf.rs.beans.SimpleEJB;
+import org.apache.openejb.util.NetworkUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -44,10 +45,13 @@ public class DynamicSubclassEjbDeploymen
private static EJBContainer container;
private static RESTIsVeryCool service;
+ private static int port = -1;
@BeforeClass
public static void start() throws Exception {
- Properties properties = new Properties();
+ port = NetworkUtil.getNextAvailablePort();
+ final Properties properties = new Properties();
+ properties.setProperty("httpejbd.port", Integer.toString(port));
properties.setProperty(DeploymentFilterable.CLASSPATH_INCLUDE, ".*openejb-cxf-rs.*");
properties.setProperty(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true");
container = EJBContainer.createEJBContainer(properties);
@@ -69,23 +73,23 @@ public class DynamicSubclassEjbDeploymen
@Test
public void rest() {
- String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").path("/ejb/rest").get(String.class);
+ final String response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/ejb/rest").get(String.class);
assertEquals("ok", response);
}
@Test
public void restParameterInjected() {
- String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").path("/ejb/param").get(String.class);
+ String response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/ejb/param").get(String.class);
assertEquals("true", response);
- response = WebClient.create("http://localhost:4204/openejb-cxf-rs").path("/ejb/param").query("arg", "foo").get(String.class);
+ response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/ejb/param").query("arg", "foo").get(String.class);
assertEquals("foo", response);
}
@Test
public void restFieldInjected() {
- Boolean response = WebClient.create("http://localhost:4204/openejb-cxf-rs").path("/ejb/field").get(Boolean.class);
- assertEquals(true, response.booleanValue());
+ final Boolean response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/ejb/field").get(Boolean.class);
+ assertEquals(true, response);
}
@Stateless
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EJBAccessExceptionMapperTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EJBAccessExceptionMapperTest.java?rev=1611316&r1=1611315&r2=1611316&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EJBAccessExceptionMapperTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EJBAccessExceptionMapperTest.java Thu Jul 17 10:40:01 2014
@@ -20,6 +20,7 @@ import org.apache.cxf.jaxrs.client.WebCl
import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.config.DeploymentFilterable;
import org.apache.openejb.server.cxf.rs.beans.SimpleEJB;
+import org.apache.openejb.util.NetworkUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -44,10 +45,13 @@ import static org.junit.Assert.assertEqu
public class EJBAccessExceptionMapperTest {
private static EJBContainer container;
private static RESTIsCoolOne service;
+ private static int port = -1;
@BeforeClass
public static void start() throws Exception {
+ port = NetworkUtil.getNextAvailablePort();
final Properties properties = new Properties();
+ properties.setProperty("httpejbd.port", Integer.toString(port));
properties.setProperty(DeploymentFilterable.CLASSPATH_INCLUDE, ".*openejb-cxf-rs.*");
properties.setProperty(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true");
container = EJBContainer.createEJBContainer(properties);
@@ -64,7 +68,7 @@ public class EJBAccessExceptionMapperTes
@Test
public void rest() {
- final Response response = WebClient.create("http://localhost:4204/openejb-cxf-rs").path("/ejbsecu/rest").get();
+ final Response response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/ejbsecu/rest").get();
assertEquals(403, response.getStatus());
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EjbDeploymentTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EjbDeploymentTest.java?rev=1611316&r1=1611315&r2=1611316&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EjbDeploymentTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EjbDeploymentTest.java Thu Jul 17 10:40:01 2014
@@ -21,6 +21,7 @@ import org.apache.cxf.jaxrs.client.WebCl
import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.config.DeploymentFilterable;
import org.apache.openejb.server.cxf.rs.beans.SimpleEJB;
+import org.apache.openejb.util.NetworkUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -41,10 +42,13 @@ import static org.junit.Assert.assertNot
public class EjbDeploymentTest {
private static EJBContainer container;
private static RESTIsCoolTwo service;
+ private static int port = -1;
@BeforeClass
public static void start() throws Exception {
+ port = NetworkUtil.getNextAvailablePort();
final Properties properties = new Properties();
+ properties.setProperty("httpejbd.port", Integer.toString(port));
properties.setProperty(DeploymentFilterable.CLASSPATH_INCLUDE, ".*openejb-cxf-rs.*");
properties.setProperty(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true");
container = EJBContainer.createEJBContainer(properties);
@@ -66,22 +70,22 @@ public class EjbDeploymentTest {
@Test
public void rest() {
- final String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").path("/ejb/rest").get(String.class);
+ final String response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/ejb/rest").get(String.class);
assertEquals("ok", response);
}
@Test
public void restParameterInjected() {
- String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").path("/ejb/param").get(String.class);
+ String response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/ejb/param").get(String.class);
assertEquals("true", response);
- response = WebClient.create("http://localhost:4204/openejb-cxf-rs").path("/ejb/param").query("arg", "foo").get(String.class);
+ response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/ejb/param").query("arg", "foo").get(String.class);
assertEquals("foo", response);
}
@Test
public void restFieldInjected() {
- final Boolean response = WebClient.create("http://localhost:4204/openejb-cxf-rs").path("/ejb/field").get(Boolean.class);
+ final Boolean response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/ejb/field").get(Boolean.class);
assertEquals(true, response);
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSRoutingTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSRoutingTest.java?rev=1611316&r1=1611315&r2=1611316&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSRoutingTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSRoutingTest.java Thu Jul 17 10:40:01 2014
@@ -24,8 +24,12 @@ import org.apache.openejb.server.cxf.rs.
import org.apache.openejb.server.cxf.rs.beans.RestWithInjections;
import org.apache.openejb.server.cxf.rs.beans.SimpleEJB;
import org.apache.openejb.testing.Classes;
+import org.apache.openejb.testing.Configuration;
import org.apache.openejb.testing.EnableServices;
import org.apache.openejb.testing.Module;
+import org.apache.openejb.testng.PropertiesBuilder;
+import org.apache.openejb.util.NetworkUtil;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -33,6 +37,7 @@ import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.core.Application;
import java.util.HashSet;
+import java.util.Properties;
import java.util.Set;
import static org.junit.Assert.assertEquals;
@@ -40,7 +45,18 @@ import static org.junit.Assert.assertEqu
@EnableServices("jax-rs")
@RunWith(ApplicationComposer.class)
public class JAXRSRoutingTest {
- public static final String BASE_URL = "http://localhost:4204/foo/";
+
+ private static int port = -1;
+
+ @BeforeClass
+ public static void beforeClass() {
+ port = NetworkUtil.getNextAvailablePort();
+ }
+
+ @Configuration
+ public Properties props() {
+ return new PropertiesBuilder().p("httpejbd.port", Integer.toString(port)).build();
+ }
@Module
@Classes(cdi = true, value = {RestWithInjections.class, FirstService.class, SimpleEJB.class, MyExpertRestClass.class, MyFirstRestClass.class})
@@ -53,7 +69,7 @@ public class JAXRSRoutingTest {
@Test
public void routing() {
- assertEquals("routing", WebClient.create(BASE_URL).path("routing").get(String.class));
+ assertEquals("routing", WebClient.create("http://localhost:" + port + "/foo/").path("routing").get(String.class));
}
public static class NoClassAtPathApplication extends Application {
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSWithInterfaceTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSWithInterfaceTest.java?rev=1611316&r1=1611315&r2=1611316&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSWithInterfaceTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSWithInterfaceTest.java Thu Jul 17 10:40:01 2014
@@ -24,8 +24,12 @@ import org.apache.openejb.server.cxf.rs.
import org.apache.openejb.server.cxf.rs.beans.RestWithInjections;
import org.apache.openejb.server.cxf.rs.beans.SimpleEJB;
import org.apache.openejb.testing.Classes;
+import org.apache.openejb.testing.Configuration;
import org.apache.openejb.testing.EnableServices;
import org.apache.openejb.testing.Module;
+import org.apache.openejb.testng.PropertiesBuilder;
+import org.apache.openejb.util.NetworkUtil;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -33,6 +37,7 @@ import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.core.Application;
import java.util.HashSet;
+import java.util.Properties;
import java.util.Set;
import static org.junit.Assert.assertEquals;
@@ -40,7 +45,18 @@ import static org.junit.Assert.assertEqu
@EnableServices("jax-rs")
@RunWith(ApplicationComposer.class)
public class JAXRSWithInterfaceTest {
- public static final String BASE_URL = "http://localhost:4204/foo/";
+
+ private static int port = -1;
+
+ @BeforeClass
+ public static void beforeClass() {
+ port = NetworkUtil.getNextAvailablePort();
+ }
+
+ @Configuration
+ public Properties props() {
+ return new PropertiesBuilder().p("httpejbd.port", Integer.toString(port)).build();
+ }
@Module
@Classes(cdi = true, value = {Impl.class, RestWithInjections.class, SimpleEJB.class, MyExpertRestClass.class, MyFirstRestClass.class})
@@ -53,7 +69,7 @@ public class JAXRSWithInterfaceTest {
@Test
public void itf() {
- assertEquals("itf", WebClient.create(BASE_URL).path("itf").get(String.class));
+ assertEquals("itf", WebClient.create("http://localhost:" + port + "/foo/").path("itf").get(String.class));
}
public static class InterfaceApp extends Application {
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JndiForPojoEndpointsTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JndiForPojoEndpointsTest.java?rev=1611316&r1=1611315&r2=1611316&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JndiForPojoEndpointsTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JndiForPojoEndpointsTest.java Thu Jul 17 10:40:01 2014
@@ -17,11 +17,16 @@
package org.apache.openejb.server.cxf.rs;
import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.jee.WebApp;
import org.apache.openejb.junit.ApplicationComposer;
import org.apache.openejb.testing.Classes;
+import org.apache.openejb.testing.Configuration;
import org.apache.openejb.testing.EnableServices;
import org.apache.openejb.testing.Module;
+import org.apache.openejb.testng.PropertiesBuilder;
+import org.apache.openejb.util.NetworkUtil;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -31,12 +36,29 @@ import javax.validation.constraints.NotN
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.core.Application;
+import java.util.Properties;
import static org.junit.Assert.assertEquals;
@EnableServices("jax-rs")
@RunWith(ApplicationComposer.class)
public class JndiForPojoEndpointsTest {
+
+ private static int port = -1;
+
+ @BeforeClass
+ public static void beforeClass() {
+ port = NetworkUtil.getNextAvailablePort();
+ }
+
+ @Configuration
+ public Properties props() {
+ return new PropertiesBuilder()
+ .p("httpejbd.port", Integer.toString(port))
+ .p(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true")
+ .build();
+ }
+
@Module
@Classes(cdi = true, value = {JndiEndpoint.class})
public WebApp war() {
@@ -47,7 +69,7 @@ public class JndiForPojoEndpointsTest {
@Test
public void injectionWorked() {
- assertEquals("1", WebClient.create("http://localhost:4204/foo/").path("/api/jndi").get(String.class));
+ assertEquals("1", WebClient.create("http://localhost:" + port + "/foo/").path("/api/jndi").get(String.class));
}
@Path("jndi")
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/MultipleApplicationsTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/MultipleApplicationsTest.java?rev=1611316&r1=1611315&r2=1611316&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/MultipleApplicationsTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/MultipleApplicationsTest.java Thu Jul 17 10:40:01 2014
@@ -17,19 +17,25 @@
package org.apache.openejb.server.cxf.rs;
import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.jee.WebApp;
import org.apache.openejb.junit.ApplicationComposer;
import org.apache.openejb.server.cxf.rs.beans.MyFirstRestClass;
import org.apache.openejb.server.cxf.rs.beans.MySecondRestClass;
import org.apache.openejb.testing.Classes;
+import org.apache.openejb.testing.Configuration;
import org.apache.openejb.testing.EnableServices;
import org.apache.openejb.testing.Module;
+import org.apache.openejb.testng.PropertiesBuilder;
+import org.apache.openejb.util.NetworkUtil;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import javax.ws.rs.ApplicationPath;
import javax.ws.rs.core.Application;
import java.util.Collections;
+import java.util.Properties;
import java.util.Set;
import static org.junit.Assert.assertEquals;
@@ -37,6 +43,22 @@ import static org.junit.Assert.assertEqu
@EnableServices("jax-rs")
@RunWith(ApplicationComposer.class)
public class MultipleApplicationsTest {
+
+ private static int port = -1;
+
+ @BeforeClass
+ public static void beforeClass() {
+ port = NetworkUtil.getNextAvailablePort();
+ }
+
+ @Configuration
+ public Properties props() {
+ return new PropertiesBuilder()
+ .p("httpejbd.port", Integer.toString(port))
+ .p(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true")
+ .build();
+ }
+
@Module
@Classes(cdi = true, value = {Application1.class, Application2.class, MyFirstRestClass.class})
public WebApp war() {
@@ -45,12 +67,12 @@ public class MultipleApplicationsTest {
@Test
public void app1() {
- assertEquals("Hi from REST World!", WebClient.create("http://localhost:4204/foo/").path("app1/first/hi").get(String.class));
+ assertEquals("Hi from REST World!", WebClient.create("http://localhost:" + port + "/foo/").path("app1/first/hi").get(String.class));
}
@Test
public void app2() {
- assertEquals("hi bar", WebClient.create("http://localhost:4204/foo/").path("app2/second/hi2/bar").get(String.class));
+ assertEquals("hi bar", WebClient.create("http://localhost:" + port + "/foo/").path("app2/second/hi2/bar").get(String.class));
}
@ApplicationPath("app1")
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/NoPathOnImplTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/NoPathOnImplTest.java?rev=1611316&r1=1611315&r2=1611316&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/NoPathOnImplTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/NoPathOnImplTest.java Thu Jul 17 10:40:01 2014
@@ -16,12 +16,17 @@
*/
package org.apache.openejb.server.cxf.rs;
+import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.jee.WebApp;
import org.apache.openejb.junit.ApplicationComposer;
import org.apache.openejb.loader.IO;
import org.apache.openejb.testing.Classes;
+import org.apache.openejb.testing.Configuration;
import org.apache.openejb.testing.EnableServices;
import org.apache.openejb.testing.Module;
+import org.apache.openejb.testng.PropertiesBuilder;
+import org.apache.openejb.util.NetworkUtil;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -29,12 +34,29 @@ import javax.ws.rs.GET;
import javax.ws.rs.Path;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.util.Properties;
import static org.junit.Assert.assertEquals;
@EnableServices("jax-rs")
@RunWith(ApplicationComposer.class)
public class NoPathOnImplTest {
+
+ private static int port = -1;
+
+ @BeforeClass
+ public static void beforeClass() {
+ port = NetworkUtil.getNextAvailablePort();
+ }
+
+ @Configuration
+ public Properties props() {
+ return new PropertiesBuilder()
+ .p("httpejbd.port", Integer.toString(port))
+ .p(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true")
+ .build();
+ }
+
@Module
@Classes({API.class, Impl.class})
public static WebApp service() throws Exception {
@@ -43,7 +65,7 @@ public class NoPathOnImplTest {
@Test
public void check() throws Exception {
- final HttpURLConnection conn = HttpURLConnection.class.cast(new URL("http://127.0.0.1:4204/app/api").openConnection());
+ final HttpURLConnection conn = HttpURLConnection.class.cast(new URL("http://127.0.0.1:" + port + "/app/api").openConnection());
assertEquals("ok", IO.slurp(conn.getInputStream()));
conn.getInputStream().close();
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/OptionsTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/OptionsTest.java?rev=1611316&r1=1611315&r2=1611316&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/OptionsTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/OptionsTest.java Thu Jul 17 10:40:01 2014
@@ -16,12 +16,17 @@
*/
package org.apache.openejb.server.cxf.rs;
+import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.jee.WebApp;
import org.apache.openejb.junit.ApplicationComposer;
import org.apache.openejb.loader.IO;
import org.apache.openejb.testing.Classes;
+import org.apache.openejb.testing.Configuration;
import org.apache.openejb.testing.EnableServices;
import org.apache.openejb.testing.Module;
+import org.apache.openejb.testng.PropertiesBuilder;
+import org.apache.openejb.util.NetworkUtil;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -30,12 +35,29 @@ import javax.ws.rs.OPTIONS;
import javax.ws.rs.Path;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.util.Properties;
import static org.junit.Assert.assertEquals;
@EnableServices("jax-rs")
@RunWith(ApplicationComposer.class)
public class OptionsTest {
+
+ private static int port = -1;
+
+ @BeforeClass
+ public static void beforeClass() {
+ port = NetworkUtil.getNextAvailablePort();
+ }
+
+ @Configuration
+ public Properties props() {
+ return new PropertiesBuilder()
+ .p("httpejbd.port", Integer.toString(port))
+ .p(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true")
+ .build();
+ }
+
@Module
@Classes(OptionsBean.class)
public static WebApp service() throws Exception {
@@ -44,7 +66,7 @@ public class OptionsTest {
@Test
public void check() throws Exception {
- final HttpURLConnection conn = HttpURLConnection.class.cast(new URL("http://127.0.0.1:4204/app/options").openConnection());
+ final HttpURLConnection conn = HttpURLConnection.class.cast(new URL("http://127.0.0.1:" + port + "/app/options").openConnection());
conn.setRequestMethod("OPTIONS");
assertEquals("ok", IO.slurp(conn.getInputStream()));
conn.getInputStream().close();
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/PathParamAtClassLevelTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/PathParamAtClassLevelTest.java?rev=1611316&r1=1611315&r2=1611316&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/PathParamAtClassLevelTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/PathParamAtClassLevelTest.java Thu Jul 17 10:40:01 2014
@@ -20,6 +20,7 @@ package org.apache.openejb.server.cxf.rs
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.config.DeploymentFilterable;
+import org.apache.openejb.util.NetworkUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -36,10 +37,14 @@ import static org.junit.Assert.assertEqu
public class PathParamAtClassLevelTest {
private static EJBContainer container;
+ private static int port = -1;
+
@BeforeClass
public static void start() throws Exception {
- Properties properties = new Properties();
+ port = NetworkUtil.getNextAvailablePort();
+ final Properties properties = new Properties();
properties.setProperty(DeploymentFilterable.CLASSPATH_INCLUDE, ".*openejb-cxf-rs.*");
+ properties.setProperty("httpejbd.port", Integer.toString(port));
properties.setProperty(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true");
container = EJBContainer.createEJBContainer(properties);
}
@@ -53,7 +58,7 @@ public class PathParamAtClassLevelTest {
@Test
public void rest() {
- String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").path("/match/openejb/test/normal").get(String.class);
+ final String response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/match/openejb/test/normal").get(String.class);
assertEquals("openejb", response);
}
Modified: tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiPojoTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiPojoTest.java?rev=1611316&r1=1611315&r2=1611316&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiPojoTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiPojoTest.java Thu Jul 17 10:40:01 2014
@@ -16,31 +16,48 @@
*/
package org.apache.openejb.server.cxf;
+import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.jee.WebApp;
import org.apache.openejb.junit.ApplicationComposer;
import org.apache.openejb.testing.Classes;
+import org.apache.openejb.testing.Configuration;
import org.apache.openejb.testing.EnableServices;
import org.apache.openejb.testing.Module;
+import org.apache.openejb.testng.PropertiesBuilder;
+import org.apache.openejb.util.NetworkUtil;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
import javax.inject.Inject;
import javax.jws.WebService;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceContext;
-
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.Properties;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
@EnableServices("jax-ws")
@RunWith(ApplicationComposer.class)
public class CdiPojoTest {
+
+ private static int port = -1;
+
+ @BeforeClass
+ public static void beforeClass() {
+ port = NetworkUtil.getNextAvailablePort();
+ }
+
+ @Configuration
+ public Properties props() {
+ return new PropertiesBuilder()
+ .p("httpejbd.port", Integer.toString(port))
+ .p(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true")
+ .build();
+ }
+
@Module
@Classes(value = {MyWebservice.class, ACdiTaste.class}, cdi = true)
public WebApp module() {
@@ -49,7 +66,7 @@ public class CdiPojoTest {
@Test
public void checkInjection() throws MalformedURLException {
- final MyWsApi api = Service.create(new URL("http://localhost:4204/test/ws?wsdl"),
+ final MyWsApi api = Service.create(new URL("http://localhost:" + port + "/test/ws?wsdl"),
new QName("http://cxf.server.openejb.apache.org/", "MyWebserviceService"))
.getPort(MyWsApi.class);
assertEquals("ok", api.test());
Modified: tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WebServiceWithAnUserInterceptorTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WebServiceWithAnUserInterceptorTest.java?rev=1611316&r1=1611315&r2=1611316&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WebServiceWithAnUserInterceptorTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WebServiceWithAnUserInterceptorTest.java Thu Jul 17 10:40:01 2014
@@ -19,6 +19,7 @@ package org.apache.openejb.server.cxf;
import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.config.DeploymentFilterable;
+import org.apache.openejb.util.NetworkUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -39,13 +40,15 @@ import static org.junit.Assert.assertNot
public class WebServiceWithAnUserInterceptorTest {
private static EJBContainer container;
+ private static int port = -1;
@BeforeClass
public static void start() {
+ port = NetworkUtil.getNextAvailablePort();
final Properties properties = new Properties();
properties.setProperty(DeploymentFilterable.CLASSPATH_INCLUDE, ".*openejb-cxf.*");
properties.setProperty(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true");
-
+ properties.setProperty("httpejbd.port", Integer.toString(port));
container = EJBContainer.createEJBContainer(properties);
}
@@ -57,7 +60,7 @@ public class WebServiceWithAnUserInterce
@Test
public void test() throws Exception {
Foo foo = Service.create(
- new URL("http://localhost:4204/openejb-cxf/FooImpl?wsdl"),
+ new URL("http://localhost:" + port + "/openejb-cxf/FooImpl?wsdl"),
new QName("http://cxf.server.openejb.apache.org/", "FooImplService"))
.getPort(Foo.class);
assertNotNull(foo);
Modified: tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WsJMXTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WsJMXTest.java?rev=1611316&r1=1611315&r2=1611316&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WsJMXTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WsJMXTest.java Thu Jul 17 10:40:01 2014
@@ -16,14 +16,18 @@
*/
package org.apache.openejb.server.cxf;
+import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.jee.Servlet;
import org.apache.openejb.jee.ServletMapping;
import org.apache.openejb.jee.WebApp;
import org.apache.openejb.junit.ApplicationComposer;
import org.apache.openejb.monitoring.LocalMBeanServer;
import org.apache.openejb.testing.Classes;
+import org.apache.openejb.testing.Configuration;
import org.apache.openejb.testing.EnableServices;
import org.apache.openejb.testing.Module;
+import org.apache.openejb.testng.PropertiesBuilder;
+import org.apache.openejb.util.NetworkUtil;
import org.hamcrest.CoreMatchers;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -36,6 +40,7 @@ import javax.ejb.Singleton;
import javax.jws.WebService;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
+import java.util.Properties;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
@@ -44,7 +49,24 @@ import static org.junit.Assert.assertTru
@EnableServices("jax-ws")
@RunWith(ApplicationComposer.class)
public class WsJMXTest {
- private static ObjectName[] names = new ObjectName[2];
+
+ private static final ObjectName[] names = new ObjectName[2];
+ private static int port = -1;
+
+ @BeforeClass
+ public static void beforeClass() throws MalformedObjectNameException {
+ port = NetworkUtil.getNextAvailablePort();
+ names[0] = new ObjectName("openejb.management:j2eeType=JAX-WS,J2EEServer=openejb,J2EEApplication=<empty>,EndpointType=EJB,name=AnEjbEndpoint");
+ names[1] = new ObjectName("openejb.management:j2eeType=JAX-WS,J2EEServer=openejb,J2EEApplication=<empty>,EndpointType=POJO,name=AnPojoEndpoint");
+ }
+
+ @Configuration
+ public Properties props() {
+ return new PropertiesBuilder()
+ .p("httpejbd.port", Integer.toString(port))
+ .p(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true")
+ .build();
+ }
@Module
@Classes({AnEjbEndpoint.class, AnPojoEndpoint.class})
@@ -65,18 +87,12 @@ public class WsJMXTest {
return webapp;
}
- @BeforeClass
- public static void before() throws MalformedObjectNameException {
- names[0] = new ObjectName("openejb.management:j2eeType=JAX-WS,J2EEServer=openejb,J2EEApplication=<empty>,EndpointType=EJB,name=AnEjbEndpoint");
- names[1] = new ObjectName("openejb.management:j2eeType=JAX-WS,J2EEServer=openejb,J2EEApplication=<empty>,EndpointType=POJO,name=AnPojoEndpoint");
- }
-
@Test
public void checkServiceWasDeployed() throws Exception {
assertTrue(LocalMBeanServer.get().isRegistered(names[0]));
assertTrue(LocalMBeanServer.get().isRegistered(names[1]));
- assertThat(String.class.cast(LocalMBeanServer.get().invoke(names[0], "getWsdl", new Object[0], new String[0])), CoreMatchers.containsString("<soap:address location=\"http://127.0.0.1:4204/app/AnEjbEndpoint\"/>"));
- assertThat(String.class.cast(LocalMBeanServer.get().invoke(names[1], "getWsdl", new Object[0], new String[0])), CoreMatchers.containsString("<soap:address location=\"http://127.0.0.1:4204/app/AnPojoEndpointService\"/>"));
+ assertThat(String.class.cast(LocalMBeanServer.get().invoke(names[0], "getWsdl", new Object[0], new String[0])), CoreMatchers.containsString("<soap:address location=\"http://127.0.0.1:" + port + "/app/AnEjbEndpoint\"/>"));
+ assertThat(String.class.cast(LocalMBeanServer.get().invoke(names[1], "getWsdl", new Object[0], new String[0])), CoreMatchers.containsString("<soap:address location=\"http://127.0.0.1:" + port + "/app/AnPojoEndpointService\"/>"));
}
@AfterClass