This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push: new 7cfda87 systests: fix compilation error; back System.exit(0) 7cfda87 is described below commit 7cfda87f43d41fddb0e2d0e2501cb3918807e88f Author: Alexey Markevich <buhhu...@gmail.com> AuthorDate: Fri Mar 12 13:54:08 2021 +0300 systests: fix compilation error; back System.exit(0) --- .../description/SwaggerUiConfigurationTest.java | 35 +++++++++++----------- .../apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java | 5 ---- .../ws/rm/AbstractClientPersistenceTest.java | 2 +- .../ws/rm/AbstractServerPersistenceTest.java | 2 +- .../cxf/systest/ws/rm/WSRM12ServerCycleTest.java | 2 +- .../common/AbstractBusClientServerTestBase.java | 4 +-- .../testutil/common/AbstractTestServerBase.java | 2 ++ .../testutil/common/EmbeddedJMSBrokerLauncher.java | 4 +-- .../apache/cxf/testutil/common/ServerLauncher.java | 2 +- 9 files changed, 27 insertions(+), 31 deletions(-) diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationTest.java index 9c25f3a..67ece33 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationTest.java @@ -31,11 +31,10 @@ import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider; import org.apache.cxf.jaxrs.model.AbstractResourceInfo; import org.apache.cxf.jaxrs.swagger.Swagger2Feature; import org.apache.cxf.jaxrs.swagger.ui.SwaggerUiConfig; -import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; -import org.apache.cxf.testutil.common.AbstractBusTestServerBase; +import org.apache.cxf.testutil.common.AbstractClientServerTestBase; +import org.apache.cxf.testutil.common.AbstractTestServerBase; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; @@ -43,11 +42,13 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; -public class SwaggerUiConfigurationTest extends AbstractBusClientServerTestBase { +public class SwaggerUiConfigurationTest extends AbstractClientServerTestBase { private static final String PORT = allocatePort(SwaggerUiConfigurationTest.class); - @Ignore - public static class Server extends AbstractBusTestServerBase { + public static class Server extends AbstractTestServerBase { + + private org.apache.cxf.endpoint.Server server; + @Override protected void run() { final JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean(); @@ -60,19 +61,18 @@ public class SwaggerUiConfigurationTest extends AbstractBusClientServerTestBase feature.setSwaggerUiConfig(new SwaggerUiConfig().url("/swagger.json")); sf.setFeatures(Arrays.asList(feature)); sf.setAddress("http://localhost:" + PORT + "/"); - sf.create(); + server = sf.create(); + } + + @Override + public void tearDown() throws Exception { + server.stop(); + server.destroy(); + server = null; } - public static void main(String[] args) { - try { - Server s = new Server(); - s.start(); - } catch (Exception ex) { - ex.printStackTrace(); - System.exit(-1); - } finally { - System.out.println("done!"); - } + public static void main(String[] args) throws Exception { + new Server().start(); } } @@ -81,7 +81,6 @@ public class SwaggerUiConfigurationTest extends AbstractBusClientServerTestBase AbstractResourceInfo.clearAllMaps(); //keep out of process due to stack traces testing failures assertTrue("server did not launch correctly", launchServer(Server.class, false)); - createStaticBus(); } @Test diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java index 0badeed..12b8d9d 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java @@ -59,14 +59,10 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; public class JAXRSJmsTest extends AbstractBusClientServerTestBase { - protected static boolean serversStarted; static final String JMS_PORT = EmbeddedJMSBrokerLauncher.PORT; @BeforeClass public static void startServers() throws Exception { - if (serversStarted) { - return; - } AbstractResourceInfo.clearAllMaps(); Map<String, String> props = new HashMap<>(); if (System.getProperty("org.apache.activemq.default.directory.prefix") != null) { @@ -80,7 +76,6 @@ public class JAXRSJmsTest extends AbstractBusClientServerTestBase { launchServer(EmbeddedJMSBrokerLauncher.class, props, null, false)); assertTrue("server did not launch correctly", launchServer(JMSServer.class, true)); - serversStarted = true; } @Test diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractClientPersistenceTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractClientPersistenceTest.java index 4fa4576..1ac3a3d 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractClientPersistenceTest.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractClientPersistenceTest.java @@ -116,7 +116,7 @@ public abstract class AbstractClientPersistenceTest extends AbstractBusClientSer ep = null; } - public static void main(String[] args) { + public static void main(String[] args) throws Exception { new Server(args).start(); } diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractServerPersistenceTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractServerPersistenceTest.java index ab190fa..98a7166 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractServerPersistenceTest.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractServerPersistenceTest.java @@ -105,7 +105,7 @@ public abstract class AbstractServerPersistenceTest extends AbstractBusClientSer ep.stop(); ep = null; } - public static void main(String[] args) { + public static void main(String[] args) throws Exception { new Server(args).start(); } } diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRM12ServerCycleTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRM12ServerCycleTest.java index d5d79b1..b4e35e9 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRM12ServerCycleTest.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRM12ServerCycleTest.java @@ -89,7 +89,7 @@ public class WSRM12ServerCycleTest extends AbstractBusClientServerTestBase { ep.stop(); ep = null; } - public static void main(String[] args) { + public static void main(String[] args) throws Exception { new Server(args).start(); } } diff --git a/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractBusClientServerTestBase.java b/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractBusClientServerTestBase.java index 2644d1f..8606985 100644 --- a/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractBusClientServerTestBase.java +++ b/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractBusClientServerTestBase.java @@ -58,7 +58,7 @@ public abstract class AbstractBusClientServerTestBase extends AbstractClientServ public static Bus getStaticBus() { return staticBus; } - public static Bus createStaticBus(String config) throws Exception { + public static Bus createStaticBus(String config) { if (config != null) { staticBus = new SpringBusFactory().createBus(config); } else { @@ -68,7 +68,7 @@ public abstract class AbstractBusClientServerTestBase extends AbstractClientServ return staticBus; } - public static Bus createStaticBus() throws Exception { + public static Bus createStaticBus() { return createStaticBus(null); } diff --git a/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractTestServerBase.java b/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractTestServerBase.java index 7b53c76..f106a61 100644 --- a/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractTestServerBase.java +++ b/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractTestServerBase.java @@ -83,6 +83,8 @@ public abstract class AbstractTestServerBase { } System.out.println("server stopped"); } + // still required for some standalone servers + System.exit(0); //NOPMD } public void setUp() throws Exception { diff --git a/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java b/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java index eb6b28f..68a7baa 100644 --- a/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java +++ b/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java @@ -44,10 +44,10 @@ public class EmbeddedJMSBrokerLauncher extends AbstractBusTestServerBase { private final String brokerUrl1; public EmbeddedJMSBrokerLauncher() { - this("tcp://localhost:" + PORT); + this(null); } public EmbeddedJMSBrokerLauncher(String url) { - brokerUrl1 = url; + brokerUrl1 = url != null ? url : "tcp://localhost:" + PORT; } public void setBrokerName(String s) { brokerName = s; diff --git a/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java b/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java index 56d5a56..e3eb171 100644 --- a/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java +++ b/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java @@ -39,7 +39,7 @@ import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.common.util.StringUtils; public class ServerLauncher { - public static final long DEFAULT_TIMEOUT = TimeUnit.MINUTES.toMillis(3L); + public static final long DEFAULT_TIMEOUT = TimeUnit.MINUTES.toMillis(1L); protected static final String SERVER_FAILED = "server startup failed (not a log message)";