You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2016/03/10 10:19:45 UTC
tomee git commit: fixing 2 tests
Repository: tomee
Updated Branches:
refs/heads/master 05a8ed134 -> 1cbdedba7
fixing 2 tests
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1cbdedba
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1cbdedba
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1cbdedba
Branch: refs/heads/master
Commit: 1cbdedba7fd6cd076e64cc77019ae4bd2c5d83c7
Parents: 05a8ed1
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Thu Mar 10 10:19:09 2016 +0100
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Thu Mar 10 10:19:09 2016 +0100
----------------------------------------------------------------------
.../apache/openejb/server/cxf/rs/CDIApplicationTest.java | 2 +-
.../LoggingJAXRSWebAppModuleClassConfigurationTest.java | 10 +++++-----
.../java/org/apache/openejb/server/rest/RESTService.java | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/1cbdedba/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CDIApplicationTest.java
----------------------------------------------------------------------
diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CDIApplicationTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CDIApplicationTest.java
index 9cdc5f9..06b2ce0 100644
--- a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CDIApplicationTest.java
+++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CDIApplicationTest.java
@@ -68,7 +68,7 @@ public class CDIApplicationTest {
@Test
public void isCdi() {
- assertEquals(2, MyCdiRESTApplication.injection.size());
+ assertEquals(1, MyCdiRESTApplication.injection.size());
for (final Boolean b : MyCdiRESTApplication.injection) {
assertTrue(b);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/1cbdedba/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/logging/webappmodule/LoggingJAXRSWebAppModuleClassConfigurationTest.java
----------------------------------------------------------------------
diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/logging/webappmodule/LoggingJAXRSWebAppModuleClassConfigurationTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/logging/webappmodule/LoggingJAXRSWebAppModuleClassConfigurationTest.java
index 6a3853a..7196e4d 100644
--- a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/logging/webappmodule/LoggingJAXRSWebAppModuleClassConfigurationTest.java
+++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/logging/webappmodule/LoggingJAXRSWebAppModuleClassConfigurationTest.java
@@ -22,21 +22,21 @@ import org.apache.openejb.junit.ApplicationComposer;
import org.apache.openejb.server.cxf.rs.logging.LoggingJAXRSCommons;
import org.apache.openejb.testing.EnableServices;
import org.apache.openejb.testing.Module;
+import org.apache.openejb.testing.RandomPort;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
+import java.net.URL;
+
import static org.junit.Assert.assertTrue;
@EnableServices("jax-rs")
@RunWith(ApplicationComposer.class)
public class LoggingJAXRSWebAppModuleClassConfigurationTest extends LoggingJAXRSCommons {
-
- @BeforeClass
- public static void beforeClass() throws Exception {
- configurePort();
- }
+ @RandomPort("http")
+ private URL base;
@Module
public AppModule service() throws Exception {
http://git-wip-us.apache.org/repos/asf/tomee/blob/1cbdedba/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
----------------------------------------------------------------------
diff --git a/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java b/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
index d7ac5e5..6049263 100644
--- a/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
+++ b/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
@@ -203,7 +203,7 @@ public abstract class RESTService implements ServerService, SelfManaging {
if (deploymentWithApplication) { // don't do it if we detected we should use old deployment
if (appSkipped || application == null) {
- application = new InternalApplication(application);
+ application = !InternalApplication.class.isInstance(application) ? new InternalApplication(application) : application;
for (final String clazz : webApp.restClass) {
try {