Skip to content

Make sure the test server ports do not collide #2973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
reta wants to merge 1 commit into
base: main
Choose a base branch
from
+1,636 −1,625
Open

Make sure the test server ports do not collide #2973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion ...cxf/systest/sts/delegation/STSServer.java → ...t/sts/delegation/DelegationSTSServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;

public class STSServer extends AbstractBusTestServerBase {
public class DelegationSTSServer extends AbstractBusTestServerBase {

protected void run() {
setBus(new SpringBusFactory().createBus(getClass().getResource("cxf-sts-transport.xml")));
Expand Down
4 changes: 2 additions & 2 deletions ...ystests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
*/
public class SAMLDelegationTest extends AbstractBusClientServerTestBase {

private static final String STSPORT = allocatePort(STSServer.class);
private static final String STSPORT = allocatePort(DelegationSTSServer.class);

private static final String SAML2_TOKEN_TYPE =
"http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0";
Expand All @@ -80,7 +80,7 @@ public static void startServers() throws Exception {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
launchServer(STSServer.class, true)
launchServer(DelegationSTSServer.class, true)
);
}

Expand Down
6 changes: 3 additions & 3 deletions ...ests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,19 +116,19 @@
<property name="relationships" ref="relationships"/>
<property name="samlRealmCodec" ref="samlRealmCodec"/>
</bean>
<jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="transportSTS" implementor="#transportSTSProviderBean" address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport" wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/delegation/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_Port" depends-on="ClientAuthHttpsSettings">
<jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="transportSTS" implementor="#transportSTSProviderBean" address="https://localhost:${testutil.ports.DelegationSTSServer}/SecurityTokenService/Transport" wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/delegation/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_Port" depends-on="ClientAuthHttpsSettings">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
</jaxws:properties>
</jaxws:endpoint>
<jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="transportSTSUT" implementor="#transportUTSTSProviderBean" address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/TransportUT" wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/delegation/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_UT_Port" depends-on="ClientAuthHttpsSettings">
<jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="transportSTSUT" implementor="#transportUTSTSProviderBean" address="https://localhost:${testutil.ports.DelegationSTSServer}/SecurityTokenService/TransportUT" wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/delegation/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_UT_Port" depends-on="ClientAuthHttpsSettings">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
</jaxws:properties>
</jaxws:endpoint>

<httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf">
<httpj:engine port="${testutil.ports.STSServer}">
<httpj:engine port="${testutil.ports.DelegationSTSServer}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="sspass">
<sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/>
Expand Down
10 changes: 5 additions & 5 deletions ...-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,24 @@
import static org.junit.Assert.assertTrue;

public class JettyWarTest extends AbstractCdiMultiAppTest {
public static class EmbeddedJettyServer extends AbstractJettyServer {
public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
public static class EmbeddedJettyWarServer extends AbstractJettyServer {
public static final int PORT = allocatePortAsInt(EmbeddedJettyWarServer.class);

public EmbeddedJettyServer() {
public EmbeddedJettyWarServer() {
super("/jaxrs_cdi", "/", PORT, new WebBeansConfigurationListener());
}
}

@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
assertTrue("server did not launch correctly", launchServer(EmbeddedJettyWarServer.class, true));
createStaticBus();
}

@Override
protected int getPort() {
return EmbeddedJettyServer.PORT;
return EmbeddedJettyWarServer.PORT;
}

}
10 changes: 5 additions & 5 deletions ...wb/cdi-no-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,24 @@
import static org.junit.Assert.assertTrue;

public class JettyWarTest extends AbstractCdiSingleAppTest {
public static class EmbeddedJettyServer extends AbstractJettyServer {
public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
public static class EmbeddedJettyWarServer extends AbstractJettyServer {
public static final int PORT = allocatePortAsInt(EmbeddedJettyWarServer.class);

public EmbeddedJettyServer() {
public EmbeddedJettyWarServer() {
super("/jaxrs_cdi", "/", PORT, new WebBeansConfigurationListener());
}
}

@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
assertTrue("server did not launch correctly", launchServer(EmbeddedJettyWarServer.class, true));
createStaticBus();
}

@Override
protected int getPort() {
return EmbeddedJettyServer.PORT;
return EmbeddedJettyWarServer.PORT;
}

}
10 changes: 5 additions & 5 deletions .../cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,18 @@

public class JettyWarTest extends AbstractCdiSingleAppTest {
@Ignore
public static class EmbeddedJettyServer extends AbstractJettyServer {
public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
public static class EmbeddedJettyWarServer extends AbstractJettyServer {
public static final int PORT = allocatePortAsInt(EmbeddedJettyWarServer.class);

public EmbeddedJettyServer() {
public EmbeddedJettyWarServer() {
super("/jaxrs_cdi", "/", PORT, new WebBeansConfigurationListener());
}
}

@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
assertTrue("server did not launch correctly", launchServer(EmbeddedJettyWarServer.class, true));
createStaticBus();
}

Expand Down Expand Up @@ -102,6 +102,6 @@ public void testConfiguredProviders() {

@Override
protected int getPort() {
return EmbeddedJettyServer.PORT;
return EmbeddedJettyWarServer.PORT;
}
}
10 changes: 5 additions & 5 deletions ...multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@

public class JettyWarTest extends AbstractCdiMultiAppTest {
@Ignore
public static class EmbeddedJettyServer extends AbstractJettyServer {
public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
public static class EmbeddedJettyWarServer extends AbstractJettyServer {
public static final int PORT = allocatePortAsInt(EmbeddedJettyWarServer.class);

public EmbeddedJettyServer() {
public EmbeddedJettyWarServer() {
super("/jaxrs_cdi", "/", PORT, new Listener());
}
}
Expand All @@ -45,13 +45,13 @@ public EmbeddedJettyServer() {
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
System.setProperty(Container.class.getName(), JettyContainer.class.getName());
assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
assertTrue("server did not launch correctly", launchServer(EmbeddedJettyWarServer.class, true));
createStaticBus();
}

@Override
protected int getPort() {
return EmbeddedJettyServer.PORT;
return EmbeddedJettyWarServer.PORT;
}

}
10 changes: 5 additions & 5 deletions ...d/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@

public class JettyWarTest extends AbstractCdiSingleAppTest {
@Ignore
public static class EmbeddedJettyServer extends AbstractJettyServer {
public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
public static class EmbeddedJettyWarServer extends AbstractJettyServer {
public static final int PORT = allocatePortAsInt(EmbeddedJettyWarServer.class);

public EmbeddedJettyServer() {
public EmbeddedJettyWarServer() {
super("/jaxrs_cdi", "/", PORT, new Listener());
}
}
Expand All @@ -44,13 +44,13 @@ public EmbeddedJettyServer() {
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
System.setProperty(Container.class.getName(), JettyContainer.class.getName());
assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
assertTrue("server did not launch correctly", launchServer(EmbeddedJettyWarServer.class, true));
createStaticBus();
}

@Override
protected int getPort() {
return EmbeddedJettyServer.PORT;
return EmbeddedJettyWarServer.PORT;
}

}
10 changes: 5 additions & 5 deletions ...cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@

public class JettyWarTest extends AbstractBookStoreCdiTest {
@Ignore
public static class EmbeddedJettyServer extends AbstractJettyServer {
public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
public static class EmbeddedJettyWarServer extends AbstractJettyServer {
public static final int PORT = allocatePortAsInt(EmbeddedJettyWarServer.class);

public EmbeddedJettyServer() {
public EmbeddedJettyWarServer() {
super("/jaxrs_cdi", "/", PORT, new Listener());
}
}
Expand All @@ -44,11 +44,11 @@ public EmbeddedJettyServer() {
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
System.setProperty(Container.class.getName(), JettyContainer.class.getName());
assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
assertTrue("server did not launch correctly", launchServer(EmbeddedJettyWarServer.class, true));
createStaticBus();
}

protected int getPort() {
return EmbeddedJettyServer.PORT;
return EmbeddedJettyWarServer.PORT;
}
}
8 changes: 4 additions & 4 deletions ...src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceAsteriskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@
import static org.junit.Assert.assertTrue;

public class JAXRSClientServerUserResourceAsteriskTest extends AbstractClientServerTestBase {
public static final String PORT = allocatePort(Server.class);
public static final String PORT = allocatePort(UserResourceAsteriskServer.class);
public static final String CONTEXT = "/jetty/*/asterisk";

public static class Server extends AbstractServerTestServerBase {
public static class UserResourceAsteriskServer extends AbstractServerTestServerBase {
@Override
protected org.apache.cxf.endpoint.Server createServer(Bus bus) throws Exception {
JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
Expand Down Expand Up @@ -93,14 +93,14 @@ protected org.apache.cxf.endpoint.Server createServer(Bus bus) throws Exception
}

public static void main(String[] args) throws Exception {
new Server().start();
new UserResourceAsteriskServer().start();
}
}

@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
assertTrue("server did not launch correctly", launchServer(Server.class));
assertTrue("server did not launch correctly", launchServer(UserResourceAsteriskServer.class));
}

@Test
Expand Down
8 changes: 4 additions & 4 deletions .../src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceDefaultTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@
import static org.junit.Assert.assertTrue;

public class JAXRSClientServerUserResourceDefaultTest extends AbstractBusClientServerTestBase {
public static final String PORT = allocatePort(Server.class);
public static final String PORT = allocatePort(UserResourceDefaultServer.class);

public static class Server extends AbstractServerTestServerBase {
public static class UserResourceDefaultServer extends AbstractServerTestServerBase {

@Override
protected org.apache.cxf.endpoint.Server createServer(Bus bus) throws Exception {
Expand Down Expand Up @@ -122,15 +122,15 @@ protected org.apache.cxf.endpoint.Server createServer(Bus bus) throws Exception
}

public static void main(String[] args) throws Exception {
new Server().start();
new UserResourceDefaultServer().start();
}
}

@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
assertTrue("server did not launch correctly",
launchServer(Server.class, true));
launchServer(UserResourceDefaultServer.class, true));
createStaticBus();
}

Expand Down
8 changes: 4 additions & 4 deletions ...s/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
import static org.junit.Assert.assertTrue;

public class JAXRSClientServerUserResourceTest extends AbstractClientServerTestBase {
public static final String PORT = allocatePort(Server.class);
public static final String PORT = allocatePort(UserResourceServer.class);

public static class Server extends AbstractServerTestServerBase {
public static class UserResourceServer extends AbstractServerTestServerBase {

@Override
protected org.apache.cxf.endpoint.Server createServer(Bus bus) throws Exception {
Expand Down Expand Up @@ -93,15 +93,15 @@ protected org.apache.cxf.endpoint.Server createServer(Bus bus) throws Exception
}

public static void main(String[] args) throws Exception {
new Server().start();
new UserResourceServer().start();
}
}

@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
assertTrue("server did not launch correctly",
launchServer(Server.class, true));
launchServer(UserResourceServer.class, true));
}

@Test
Expand Down
10 changes: 5 additions & 5 deletions systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUnicodeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@
import static org.junit.Assert.assertEquals;

public class JAXRSUnicodeTest extends AbstractBusClientServerTestBase {
public static final int PORT = SpringServer.PORT;
public static final int PORT = SpringUnicodeServer.PORT;

@BeforeClass
public static void beforeClass() throws Exception {
// must be 'in-process' to communicate with inner class in single JVM
// and to spawn class SpringServer w/o using main() method
launchServer(SpringServer.class, true);
launchServer(SpringUnicodeServer.class, true);
}
@Ignore
public static class SpringServer extends AbstractSpringServer {
public static final int PORT = allocatePortAsInt(SpringServer.class);
public SpringServer() {
public static class SpringUnicodeServer extends AbstractSpringServer {
public static final int PORT = allocatePortAsInt(SpringUnicodeServer.class);
public SpringUnicodeServer() {
super("/jaxrs_unicode", PORT);
}
}
Expand Down
10 changes: 5 additions & 5 deletions systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoMatchTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,18 @@
import static org.junit.Assert.assertEquals;

public class JAXRSUriInfoMatchTest extends AbstractClientServerTestBase {
public static final int PORT = SpringServer.PORT;
public static final int PORT = SpringUriInfoMatchServer.PORT;
@BeforeClass
public static void beforeClass() throws Exception {
// must be 'in-process' to communicate with inner class in single JVM
// and to spawn class SpringServer w/o using main() method
launchServer(SpringServer.class, true);
launchServer(SpringUriInfoMatchServer.class, true);
}

@Ignore
public static class SpringServer extends AbstractSpringServer {
public static final int PORT = allocatePortAsInt(SpringServer.class);
public SpringServer() {
public static class SpringUriInfoMatchServer extends AbstractSpringServer {
public static final int PORT = allocatePortAsInt(SpringUriInfoMatchServer.class);
public SpringUriInfoMatchServer() {
super("/jaxrs_uriinfo_match", "/match", PORT);
}
}
Expand Down
10 changes: 5 additions & 5 deletions systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@
import static org.junit.Assert.assertEquals;

public class JAXRSUriInfoTest extends AbstractClientServerTestBase {
public static final int PORT = SpringServer.PORT;
public static final int PORT = SpringUriInfoServer.PORT;
@BeforeClass
public static void beforeClass() throws Exception {
// must be 'in-process' to communicate with inner class in single JVM
// and to spawn class SpringServer w/o using main() method
launchServer(SpringServer.class, true);
launchServer(SpringUriInfoServer.class, true);
}

@Ignore
public static class SpringServer extends AbstractSpringServer {
public static final int PORT = allocatePortAsInt(SpringServer.class);
public SpringServer() {
public static class SpringUriInfoServer extends AbstractSpringServer {
public static final int PORT = allocatePortAsInt(SpringUriInfoServer.class);
public SpringUriInfoServer() {
super("/jaxrs_uriinfo", "/app", PORT);
}
}
Expand Down
Loading
Loading