Skip to content

Use dynamic port for LostLogoutTest, LostLogoutThreadedTest, SocketAcceptorTest #573

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

Merged
merged 2 commits into from
Nov 21, 2022
Merged

Use dynamic port for LostLogoutTest, LostLogoutThreadedTest, SocketAcceptorTest #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a437525
issue-487 - fixed for LostLogoutTest & LostLogoutThreadedTest
busy-spin Nov 18, 2022
f70c199
Fixes quickfix-j/quickfix-j#487
busy-spin Nov 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions quickfixj-core/src/test/java/quickfix/SocketAcceptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,10 @@ public void testRestartOfAcceptor() throws Exception {
Acceptor acceptor = null;
Initiator initiator = null;
try {
acceptor = createAcceptor(testAcceptorApplication);
final int port = AvailablePortFinder.getNextAvailable();
acceptor = createAcceptor(testAcceptorApplication, port);
acceptor.start();
initiator = createInitiator(testInitiatorApplication);
initiator = createInitiator(testInitiatorApplication, port);

assertNotNull("Session should be registered", lookupSession(acceptorSessionID));

Expand Down Expand Up @@ -131,7 +132,8 @@ public void testQuickRestartOfAcceptor() throws Exception {
try {
ThreadMXBean bean = ManagementFactory.getThreadMXBean();
TestConnectorApplication testAcceptorApplication = new TestConnectorApplication();
acceptor = createAcceptor(testAcceptorApplication);
final int port = AvailablePortFinder.getNextAvailable();
acceptor = createAcceptor(testAcceptorApplication, port);
acceptor.start();
Thread.sleep(2500L);
acceptor.stop();
Expand All @@ -152,7 +154,8 @@ public void testDoubleStartOfAcceptor() throws Exception {
try {
ThreadMXBean bean = ManagementFactory.getThreadMXBean();
TestConnectorApplication testAcceptorApplication = new TestConnectorApplication();
acceptor = createAcceptor(testAcceptorApplication);
final int port = AvailablePortFinder.getNextAvailable();
acceptor = createAcceptor(testAcceptorApplication, port);
acceptor.start();
// second start should be ignored
acceptor.start();
Expand All @@ -170,7 +173,8 @@ public void testSessionsAreCleanedUp() throws Exception {
Acceptor acceptor = null;
try {
TestConnectorApplication testAcceptorApplication = new TestConnectorApplication();
acceptor = createAcceptor(testAcceptorApplication);
final int port = AvailablePortFinder.getNextAvailable();
acceptor = createAcceptor(testAcceptorApplication, port);
acceptor.start();
assertEquals(1, acceptor.getSessions().size() );
assertEquals(1 + SESSION_COUNT, Session.numSessions() );
Expand All @@ -189,7 +193,8 @@ public void testSessionsAreCleanedUpOnThreadedSocketAcceptor() throws Exception
Acceptor acceptor = null;
try {
TestConnectorApplication testAcceptorApplication = new TestConnectorApplication();
acceptor = createAcceptorThreaded(testAcceptorApplication);
final int port = AvailablePortFinder.getNextAvailable();
acceptor = createAcceptorThreaded(testAcceptorApplication, port);
acceptor.start();
assertEquals(1, acceptor.getSessions().size() );
assertEquals(1 + SESSION_COUNT, Session.numSessions() );
Expand Down Expand Up @@ -345,29 +350,29 @@ public void toAdmin(Message message, SessionID sessionId) {
}


private Acceptor createAcceptor(TestConnectorApplication testAcceptorApplication)
private Acceptor createAcceptor(TestConnectorApplication testAcceptorApplication, int port)
throws ConfigError {

SessionSettings settings = createAcceptorSettings();
SessionSettings settings = createAcceptorSettings(port);

MessageStoreFactory factory = new MemoryStoreFactory();
quickfix.LogFactory logFactory = new SLF4JLogFactory(new SessionSettings());
return new SocketAcceptor(testAcceptorApplication, factory, settings, logFactory,
new DefaultMessageFactory());
}

private Acceptor createAcceptorThreaded(TestConnectorApplication testAcceptorApplication)
private Acceptor createAcceptorThreaded(TestConnectorApplication testAcceptorApplication, int port)
throws ConfigError {

SessionSettings settings = createAcceptorSettings();
SessionSettings settings = createAcceptorSettings(port);

MessageStoreFactory factory = new MemoryStoreFactory();
quickfix.LogFactory logFactory = new SLF4JLogFactory(new SessionSettings());
return new ThreadedSocketAcceptor(testAcceptorApplication, factory, settings, logFactory,
new DefaultMessageFactory());
}

private SessionSettings createAcceptorSettings() {
private SessionSettings createAcceptorSettings(int socketAcceptPort) {
SessionSettings settings = new SessionSettings();
HashMap<Object, Object> defaults = new HashMap<>();
defaults.put("ConnectionType", "acceptor");
Expand All @@ -376,12 +381,12 @@ private SessionSettings createAcceptorSettings() {
defaults.put("BeginString", "FIX.4.2");
defaults.put("NonStopSession", "Y");
settings.setString(acceptorSessionID, "SocketAcceptProtocol", ProtocolFactory.getTypeString(ProtocolFactory.SOCKET));
settings.setString(acceptorSessionID, "SocketAcceptPort", "10000");
settings.setString(acceptorSessionID, "SocketAcceptPort", String.valueOf(socketAcceptPort));
settings.set(defaults);
return settings;
}

private Initiator createInitiator(TestConnectorApplication testInitiatorApplication) throws ConfigError {
private Initiator createInitiator(TestConnectorApplication testInitiatorApplication, int socketConnectPort) throws ConfigError {
SessionSettings settings = new SessionSettings();
HashMap<Object, Object> defaults = new HashMap<>();
defaults.put("ConnectionType", "initiator");
Expand All @@ -395,7 +400,7 @@ private Initiator createInitiator(TestConnectorApplication testInitiatorApplicat
settings.setString("BeginString", FixVersions.BEGINSTRING_FIX42);
settings.setString(initiatorSessionID, "SocketConnectProtocol", ProtocolFactory.getTypeString(ProtocolFactory.SOCKET));
settings.setString(initiatorSessionID, "SocketConnectHost", "127.0.0.1");
settings.setString(initiatorSessionID, "SocketConnectPort", "10000");
settings.setString(initiatorSessionID, "SocketConnectPort", String.valueOf(socketConnectPort));
settings.set(defaults);

MessageStoreFactory factory = new MemoryStoreFactory();
Expand Down
14 changes: 8 additions & 6 deletions quickfixj-core/src/test/java/quickfix/mina/LostLogoutTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package quickfix.mina;

import org.apache.mina.util.AvailablePortFinder;
import org.junit.Test;
import quickfix.Application;
import quickfix.DefaultMessageFactory;
Expand Down Expand Up @@ -51,11 +52,12 @@ public class LostLogoutTest {

@Test
public void lostLogoutMessageTest() throws Exception {
final int port = AvailablePortFinder.getNextAvailable();
// create server (acceptor)
server = new ServerApp();
server = new ServerApp(port);

// create client (initiator) and start the FIX session (log on)
client = new ClientApp();
client = new ClientApp(port);

// wait until until client is logged on
client.waitUntilLoggedOn();
Expand Down Expand Up @@ -89,11 +91,11 @@ private class ServerApp implements Application {
private SocketAcceptor acceptor = null;

private final SessionID sid = new SessionID("FIX.4.4", "SERVER", "CLIENT");
public ServerApp() throws Exception {
public ServerApp(int port) throws Exception {
SessionSettings settings = new SessionSettings();
settings.setString("ConnectionType", "acceptor");
settings.setString("SocketAcceptAddress", "127.0.0.1");
settings.setLong("SocketAcceptPort", 54321);
settings.setLong("SocketAcceptPort", port);
settings.setString("StartTime", "00:00:00");
settings.setString("EndTime", "00:00:00");
settings.setString("UseDataDictionary", "N");
Expand Down Expand Up @@ -164,12 +166,12 @@ private static class ClientApp implements Application {
private SocketInitiator initiator = null;
private Session session;

public ClientApp() throws Exception {
public ClientApp(int port) throws Exception {
SessionID sid = new SessionID("FIX.4.4", "CLIENT", "SERVER");
SessionSettings settings = new SessionSettings();
settings.setString("ConnectionType", "initiator");
settings.setString("SocketConnectHost", "127.0.0.1");
settings.setLong("SocketConnectPort", 54321);
settings.setLong("SocketConnectPort", port);
settings.setString("StartTime", "00:00:00");
settings.setString("EndTime", "00:00:00");
settings.setLong("HeartBtInt", 30);
Expand Down
14 changes: 8 additions & 6 deletions quickfixj-core/src/test/java/quickfix/mina/LostLogoutThreadedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package quickfix.mina;

import org.apache.mina.util.AvailablePortFinder;
import org.junit.Test;
import quickfix.Application;
import quickfix.DefaultMessageFactory;
Expand Down Expand Up @@ -51,11 +52,12 @@ public class LostLogoutThreadedTest {

@Test
public void lostLogoutMessageTest() throws Exception {
final int port = AvailablePortFinder.getNextAvailable();
// create server (acceptor)
server = new ServerApp();
server = new ServerApp(port);

// create client (initiator) and start the FIX session (log on)
client = new ClientApp();
client = new ClientApp(port);

// wait until until client is logged on
client.waitUntilLoggedOn();
Expand Down Expand Up @@ -88,12 +90,12 @@ public void lostLogoutMessageTest() throws Exception {
private class ServerApp implements Application {
private ThreadedSocketAcceptor acceptor = null;

public ServerApp() throws Exception {
public ServerApp(int port) throws Exception {
SessionID sid = new SessionID("FIX.4.4", "SERVER", "CLIENT");
SessionSettings settings = new SessionSettings();
settings.setString("ConnectionType", "acceptor");
settings.setString("SocketAcceptAddress", "127.0.0.1");
settings.setLong("SocketAcceptPort", 54321);
settings.setLong("SocketAcceptPort", port);
settings.setString("StartTime", "00:00:00");
settings.setString("EndTime", "00:00:00");
settings.setString("UseDataDictionary", "N");
Expand Down Expand Up @@ -164,12 +166,12 @@ private static class ClientApp implements Application {
private ThreadedSocketInitiator initiator = null;
private Session session;

public ClientApp() throws Exception {
public ClientApp(int port) throws Exception {
SessionID sid = new SessionID("FIX.4.4", "CLIENT", "SERVER");
SessionSettings settings = new SessionSettings();
settings.setString("ConnectionType", "initiator");
settings.setString("SocketConnectHost", "127.0.0.1");
settings.setLong("SocketConnectPort", 54321);
settings.setLong("SocketConnectPort", port);
settings.setString("StartTime", "00:00:00");
settings.setString("EndTime", "00:00:00");
settings.setLong("HeartBtInt", 30);
Expand Down