This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 3a3a7309a5 ARTEMIS-5808 Improve readability on compatibility tests
3a3a7309a5 is described below
commit 3a3a7309a5417e23aba4dc735eaa22944b80c6d5
Author: Clebert Suconic <[email protected]>
AuthorDate: Wed Dec 10 12:22:44 2025 -0500
ARTEMIS-5808 Improve readability on compatibility tests
Some compatibility tests only use 2 classLoader. We could make this case
more readable.
---
.../tests/compatibility/AddressConfigTest.java | 14 +----
.../AddressPauseJournalCompatibilityTest.java | 23 +++-----
...ctionFactoryConfigurationSerializationTest.java | 19 ++-----
.../tests/compatibility/ExportImportTest.java | 25 ++++-----
.../tests/compatibility/FQQNConsumerTest.java | 4 +-
.../tests/compatibility/HQLargeMeshTest.java | 13 +----
.../tests/compatibility/HQSelectorTest.java | 14 +----
.../compatibility/JournalCompatibilityTest.java | 62 ++++++++++------------
.../artemis/tests/compatibility/MeshTest.java | 12 -----
.../tests/compatibility/OldAddressSpaceTest.java | 2 +-
.../tests/compatibility/PagingCounterTest.java | 25 ++++-----
.../tests/compatibility/PrefixSendAckTest.java | 2 +-
.../QueuePauseJournalCompatibilityTest.java | 23 +++-----
.../artemis/tests/compatibility/ReplyToTest.java | 13 +----
.../artemis/tests/compatibility/SendAckTest.java | 14 +----
.../tests/compatibility/SerializationTest.java | 19 +++----
.../tests/compatibility/base/ServerBase.java | 2 +-
.../tests/compatibility/base/VersionedBase.java | 48 ++++++++++++-----
18 files changed, 117 insertions(+), 217 deletions(-)
diff --git
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/AddressConfigTest.java
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/AddressConfigTest.java
index 34c3916583..40d9110491 100644
---
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/AddressConfigTest.java
+++
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/AddressConfigTest.java
@@ -40,22 +40,10 @@ import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(ParameterizedTestExtension.class)
public class AddressConfigTest extends VersionedBase {
- // this will ensure that all tests in this class are run twice,
- // once with "true" passed to the class' constructor and once with "false"
@Parameters(name = "server={0}, producer={1}, consumer={2}")
public static Collection getParameters() {
- // we don't need every single version ever released..
- // if we keep testing current one against 2.4 and 1.4.. we are sure the
wire and API won't change over time
List<Object[]> combinations = new ArrayList<>();
-
- /*
- // during development sometimes is useful to comment out the combinations
- // and add the ones you are interested.. example:
- */
- // combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
- // combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
-
- combinations.addAll(combinatory(new Object[]{SNAPSHOT}, new
Object[]{ONE_FOUR, SNAPSHOT}, new Object[]{ONE_FOUR, SNAPSHOT}));
+ combinations.addAll(combinatory(SNAPSHOT, new Object[]{SNAPSHOT}, new
Object[]{ONE_FOUR, SNAPSHOT}, new Object[]{ONE_FOUR, SNAPSHOT}));
return combinations;
}
diff --git
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/AddressPauseJournalCompatibilityTest.java
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/AddressPauseJournalCompatibilityTest.java
index f51ffe1b32..a66455deb1 100644
---
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/AddressPauseJournalCompatibilityTest.java
+++
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/AddressPauseJournalCompatibilityTest.java
@@ -38,31 +38,24 @@ public class AddressPauseJournalCompatibilityTest extends
VersionedBase {
// this will ensure that all tests in this class are run twice,
// once with "true" passed to the class' constructor and once with "false"
- @Parameters(name = "server={0}, producer={1}, consumer={2}")
+ @Parameters(name = "producer={0}, consumer={1}")
public static Collection getParameters() {
// we don't need every single version ever released..
// if we keep testing current one against 2.4 and 1.4.. we are sure the
wire and API won't change over time
List<Object[]> combinations = new ArrayList<>();
- /*
- // during development sometimes is useful to comment out the combinations
- // and add the ones you are interested.. example:
- */
- // combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
- // combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
-
if (getJavaVersion() <= 22) {
// 2.10.0 server fails on JDK23+ without workarounds.
- combinations.add(new Object[]{null, TWO_TEN_ZERO, SNAPSHOT});
+ combinations.add(new Object[]{TWO_TEN_ZERO, SNAPSHOT});
}
// the purpose on this one is just to validate the test itself.
/// if it can't run against itself it won't work at all
- combinations.add(new Object[]{null, SNAPSHOT, SNAPSHOT});
+ combinations.add(new Object[]{SNAPSHOT, SNAPSHOT});
return combinations;
}
- public AddressPauseJournalCompatibilityTest(String server, String sender,
String receiver) throws Exception {
- super(server, sender, receiver);
+ public AddressPauseJournalCompatibilityTest(String sender, String receiver)
throws Exception {
+ super(sender, receiver);
}
@BeforeEach
@@ -95,18 +88,18 @@ public class AddressPauseJournalCompatibilityTest extends
VersionedBase {
public void internal(String destinationName) throws Throwable {
setVariable(senderClassloader, "persistent", true);
- startServer(serverFolder, senderClassloader, "journalTest", null, true);
+ startServer(serverFolder, sender, senderClassloader, "journalTest",
null, true);
evaluate(senderClassloader, "addresspause/beforestop.groovy",
destinationName);
stopServer(senderClassloader);
setVariable(receiverClassloader, "persistent", true);
- startServer(serverFolder, receiverClassloader, "journalTest", null,
false);
+ startServer(serverFolder, receiver, receiverClassloader, "journalTest",
null, false);
evaluate(receiverClassloader, "addresspause/afterstop.groovy",
destinationName);
stopServer(receiverClassloader);
// on a third try, we run the beforestop again, as the address should
been in regular conditions when aftertop.groovy is finished
setVariable(receiverClassloader, "persistent", true);
- startServer(serverFolder, receiverClassloader, "journalTest", null,
false);
+ startServer(serverFolder, receiver, receiverClassloader, "journalTest",
null, false);
evaluate(receiverClassloader, "addresspause/beforestop.groovy",
destinationName);
stopServer(receiverClassloader);
}
diff --git
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ConnectionFactoryConfigurationSerializationTest.java
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ConnectionFactoryConfigurationSerializationTest.java
index 61ea444e1c..ff5b132461 100644
---
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ConnectionFactoryConfigurationSerializationTest.java
+++
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ConnectionFactoryConfigurationSerializationTest.java
@@ -38,27 +38,16 @@ import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(ParameterizedTestExtension.class)
public class ConnectionFactoryConfigurationSerializationTest extends
VersionedBase {
- // this will ensure that all tests in this class are run twice,
- // once with "true" passed to the class' constructor and once with "false"
- @Parameters(name = "server={0}, producer={1}, consumer={2}")
+ @Parameters(name = "producer={0}, consumer={1}")
public static Collection getParameters() {
- // we don't need every single version ever released..
- // if we keep testing current one against 2.4 and 1.4.. we are sure the
wire and API won't change over time
List<Object[]> combinations = new ArrayList<>();
- /*
- // during development sometimes is useful to comment out the combinations
- // and add the ones you are interested.. example:
- */
- // combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
- // combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
-
- combinations.addAll(combinatory(new Object[]{null}, new
Object[]{ONE_FOUR, SNAPSHOT, TWO_FOUR}, new Object[]{ONE_FOUR, SNAPSHOT,
TWO_FOUR}));
+ combinations.addAll(combinatory2(SNAPSHOT, new Object[]{ONE_FOUR,
SNAPSHOT, TWO_FOUR}, new Object[]{ONE_FOUR, SNAPSHOT, TWO_FOUR}));
return combinations;
}
- public ConnectionFactoryConfigurationSerializationTest(String server,
String sender, String receiver) throws Exception {
- super(server, sender, receiver);
+ public ConnectionFactoryConfigurationSerializationTest(String sender,
String receiver) throws Exception {
+ super(sender, receiver);
}
@BeforeEach
diff --git
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ExportImportTest.java
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ExportImportTest.java
index fa71e448b8..c8c98c4fe2 100644
---
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ExportImportTest.java
+++
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ExportImportTest.java
@@ -41,26 +41,19 @@ public class ExportImportTest extends VersionedBase {
// this will ensure that all tests in this class are run twice,
// once with "true" passed to the class' constructor and once with "false"
- @Parameters(name = "server={0}, sender={1}, consumer={2}")
+ @Parameters(name = "sender={0}, consumer={1}")
public static Collection getParameters() {
// we don't need every single version ever released..
// if we keep testing current one against 2.4 and 1.4.. we are sure the
wire and API won't change over time
List<Object[]> combinations = new ArrayList<>();
- /*
- // during development sometimes is useful to comment out the combinations
- // and add the ones you are interested.. example:
- */
- // combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
- // combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
-
- combinations.add(new Object[]{null, ONE_FOUR, SNAPSHOT});
- combinations.add(new Object[]{null, SNAPSHOT, SNAPSHOT});
+ combinations.add(new Object[]{ONE_FOUR, SNAPSHOT});
+ combinations.add(new Object[]{SNAPSHOT, SNAPSHOT});
return combinations;
}
- public ExportImportTest(String server, String sender, String receiver)
throws Exception {
- super(server, sender, receiver);
+ public ExportImportTest(String sender, String receiver) throws Exception {
+ super(sender, receiver);
}
@BeforeEach
@@ -109,8 +102,8 @@ public class ExportImportTest extends VersionedBase {
if (legacyPrefixes) {
serverScriptToUse = "exportimport/artemisServer.groovy";
}
- startServer(serverFolder, senderClassloader, "sender");
- evaluate(senderClassloader, "meshTest/sendMessages.groovy", server,
sender, "sendAckMessages");
+ startServer(serverFolder, sender, senderClassloader, "sender");
+ evaluate(senderClassloader, "meshTest/sendMessages.groovy", sender,
sender, "sendAckMessages");
stopServer(senderClassloader);
if (sender.startsWith("ARTEMIS-1")) {
@@ -122,14 +115,14 @@ public class ExportImportTest extends VersionedBase {
setVariable(receiverClassloader, "legacy", legacyPrefixes);
try {
setVariable(receiverClassloader, "persistent", true);
- startServer(serverFolder, receiverClassloader, "receiver");
+ startServer(serverFolder, receiver, receiverClassloader, "receiver");
setVariable(receiverClassloader, "sort",
sender.startsWith("ARTEMIS-1"));
evaluate(receiverClassloader, "exportimport/import.groovy",
serverFolder.getAbsolutePath());
setVariable(receiverClassloader, "latch", null);
- evaluate(receiverClassloader, "meshTest/sendMessages.groovy", server,
receiver, "receiveMessages");
+ evaluate(receiverClassloader, "meshTest/sendMessages.groovy",
receiver, receiver, "receiveMessages");
} finally {
setVariable(receiverClassloader, "legacy", false);
}
diff --git
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/FQQNConsumerTest.java
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/FQQNConsumerTest.java
index e663b98ae6..ab1113e5f1 100644
---
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/FQQNConsumerTest.java
+++
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/FQQNConsumerTest.java
@@ -44,10 +44,10 @@ public class FQQNConsumerTest extends ServerBase {
List<Object[]> combinations = new ArrayList<>();
// FQQN was added into 2.7.0, hence we only test the server as SNAPSHOT
or TWO_SEVEN_ZERO
- List testsList = combinatory(new Object[]{SNAPSHOT}, new
Object[]{SNAPSHOT, TWO_FOUR, TWO_ONE, TWO_SIX_THREE, TWO_SEVEN_ZERO}, new
Object[]{SNAPSHOT, TWO_FOUR, TWO_ONE, TWO_SIX_THREE, TWO_SEVEN_ZERO});
+ List testsList = combinatory(SNAPSHOT, new Object[]{SNAPSHOT}, new
Object[]{SNAPSHOT, TWO_FOUR, TWO_ONE, TWO_SIX_THREE, TWO_SEVEN_ZERO}, new
Object[]{SNAPSHOT, TWO_FOUR, TWO_ONE, TWO_SIX_THREE, TWO_SEVEN_ZERO});
if (getJavaVersion() <= 22) {
// 2.7.0 server fails on JDK23+ without workarounds.
- addCombinations(testsList, null, new Object[] {TWO_SEVEN_ZERO}, new
Object[]{SNAPSHOT, TWO_SEVEN_ZERO}, new Object[]{SNAPSHOT, TWO_SEVEN_ZERO});
+ addCombinations(testsList, SNAPSHOT, new Object[] {TWO_SEVEN_ZERO},
new Object[]{SNAPSHOT, TWO_SEVEN_ZERO}, new Object[]{SNAPSHOT, TWO_SEVEN_ZERO});
}
return testsList;
}
diff --git
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQLargeMeshTest.java
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQLargeMeshTest.java
index 353a72965a..f8802471bd 100644
---
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQLargeMeshTest.java
+++
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQLargeMeshTest.java
@@ -35,21 +35,10 @@ import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(ParameterizedTestExtension.class)
public class HQLargeMeshTest extends VersionedBase {
- // this will ensure that all tests in this class are run twice,
- // once with "true" passed to the class' constructor and once with "false"
@Parameters(name = "server={0}, producer={1}, consumer={2}")
public static Collection getParameters() {
- // we don't need every single version ever released..
- // if we keep testing current one against 2.4 and 1.4.. we are sure the
wire and API won't change over time
List<Object[]> combinations = new ArrayList<>();
- /*
- // during development sometimes is useful to comment out the combinations
- // and add the ones you are interested.. example:
- */
- // combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
- // combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
-
combinations.add(new Object[]{SNAPSHOT, HORNETQ_247, HORNETQ_247});
combinations.add(new Object[]{SNAPSHOT, HORNETQ_235, HORNETQ_247});
combinations.add(new Object[]{SNAPSHOT, HORNETQ_247, HORNETQ_235});
@@ -65,7 +54,7 @@ public class HQLargeMeshTest extends VersionedBase {
public void testSendReceive() throws Throwable {
FileUtil.deleteDirectory(serverFolder);
setVariable(serverClassloader, "persistent", Boolean.TRUE);
- startServer(serverFolder, serverClassloader, "live");
+ startServer(serverFolder, server, serverClassloader, "live");
try {
evaluate(senderClassloader, "meshTest/sendLargeMessages.groovy",
server, sender, "sendMessages");
diff --git
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQSelectorTest.java
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQSelectorTest.java
index ec90187c37..6a862bf704 100644
---
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQSelectorTest.java
+++
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQSelectorTest.java
@@ -35,21 +35,9 @@ import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(ParameterizedTestExtension.class)
public class HQSelectorTest extends VersionedBase {
- // this will ensure that all tests in this class are run twice,
- // once with "true" passed to the class' constructor and once with "false"
@Parameters(name = "server={0}, producer={1}, consumer={2}")
public static Collection getParameters() {
- // we don't need every single version ever released..
- // if we keep testing current one against 2.4 and 1.4.. we are sure the
wire and API won't change over time
List<Object[]> combinations = new ArrayList<>();
-
- /*
- // during development sometimes is useful to comment out the combinations
- // and add the ones you are interested.. example:
- */
- // combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
- // combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
-
combinations.add(new Object[]{SNAPSHOT, HORNETQ_247, HORNETQ_247});
combinations.add(new Object[]{SNAPSHOT, HORNETQ_235, HORNETQ_235});
return combinations;
@@ -63,7 +51,7 @@ public class HQSelectorTest extends VersionedBase {
public void testSendReceive() throws Throwable {
FileUtil.deleteDirectory(serverFolder);
setVariable(serverClassloader, "persistent", Boolean.TRUE);
- startServer(serverFolder, serverClassloader, "live");
+ startServer(serverFolder, server, serverClassloader, "live");
try {
evaluate(senderClassloader, "hqselector/sendMessages.groovy");
diff --git
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JournalCompatibilityTest.java
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JournalCompatibilityTest.java
index 789cc72d22..a1c7c58610 100644
---
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JournalCompatibilityTest.java
+++
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JournalCompatibilityTest.java
@@ -39,29 +39,22 @@ public class JournalCompatibilityTest extends VersionedBase
{
// this will ensure that all tests in this class are run twice,
// once with "true" passed to the class' constructor and once with "false"
- @Parameters(name = "server={0}, producer={1}, consumer={2}")
+ @Parameters(name = "sender={0}, receiver={1}")
public static Collection getParameters() {
// we don't need every single version ever released..
// if we keep testing current one against 2.4 and 1.4.. we are sure the
wire and API won't change over time
List<Object[]> combinations = new ArrayList<>();
- /*
- // during development sometimes is useful to comment out the combinations
- // and add the ones you are interested.. example:
- */
- // combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
- // combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
-
- combinations.add(new Object[]{null, TWO_ONE, SNAPSHOT});
- combinations.add(new Object[]{null, TWO_FOUR, SNAPSHOT});
+ combinations.add(new Object[]{TWO_ONE, SNAPSHOT});
+ combinations.add(new Object[]{TWO_FOUR, SNAPSHOT});
// the purpose on this one is just to validate the test itself.
/// if it can't run against itself it won't work at all
- combinations.add(new Object[]{null, SNAPSHOT, SNAPSHOT});
+ combinations.add(new Object[]{SNAPSHOT, SNAPSHOT});
return combinations;
}
- public JournalCompatibilityTest(String server, String sender, String
receiver) throws Exception {
- super(server, sender, receiver);
+ public JournalCompatibilityTest(String sender, String receiver) throws
Exception {
+ super(sender, receiver);
}
@BeforeEach
@@ -85,49 +78,49 @@ public class JournalCompatibilityTest extends VersionedBase
{
@TestTemplate
public void testSendReceive() throws Throwable {
setVariable(senderClassloader, "persistent", true);
- startServer(serverFolder, senderClassloader, "journalTest", null, true);
- evaluate(senderClassloader, "meshTest/sendMessages.groovy", server,
sender, "sendAckMessages");
+ startServer(serverFolder, sender, senderClassloader, "journalTest",
null, true);
+ evaluate(senderClassloader, "meshTest/sendMessages.groovy", sender,
sender, "sendAckMessages");
stopServer(senderClassloader);
setVariable(receiverClassloader, "persistent", true);
- startServer(serverFolder, receiverClassloader, "journalTest", null,
false);
+ startServer(serverFolder, receiver, receiverClassloader, "journalTest",
null, false);
setVariable(receiverClassloader, "latch", null);
- evaluate(receiverClassloader, "meshTest/sendMessages.groovy", server,
receiver, "receiveMessages");
+ evaluate(receiverClassloader, "meshTest/sendMessages.groovy", receiver,
receiver, "receiveMessages");
}
@TestTemplate
public void testSendReceivePaging() throws Throwable {
setVariable(senderClassloader, "persistent", true);
- startServer(serverFolder, senderClassloader, "journalTest", null, true);
+ startServer(serverFolder, sender, senderClassloader, "journalTest",
null, true);
evaluate(senderClassloader, "journalcompatibility/forcepaging.groovy");
- evaluate(senderClassloader, "meshTest/sendMessages.groovy", server,
sender, "sendAckMessages");
+ evaluate(senderClassloader, "meshTest/sendMessages.groovy", sender,
sender, "sendAckMessages");
evaluate(senderClassloader, "journalcompatibility/ispaging.groovy");
stopServer(senderClassloader);
setVariable(receiverClassloader, "persistent", true);
- startServer(serverFolder, receiverClassloader, "journalTest", null,
false);
+ startServer(serverFolder, receiver, receiverClassloader, "journalTest",
null, false);
evaluate(receiverClassloader, "journalcompatibility/ispaging.groovy");
setVariable(receiverClassloader, "latch", null);
- evaluate(receiverClassloader, "meshTest/sendMessages.groovy", server,
receiver, "receiveMessages");
+ evaluate(receiverClassloader, "meshTest/sendMessages.groovy", receiver,
receiver, "receiveMessages");
}
@TestTemplate
public void testSendReceiveAMQPPaging() throws Throwable {
setVariable(senderClassloader, "persistent", true);
- startServer(serverFolder, senderClassloader, "journalTest", null, true);
+ startServer(serverFolder, sender, senderClassloader, "journalTest",
null, true);
evaluate(senderClassloader, "journalcompatibility/forcepaging.groovy");
- evaluate(senderClassloader, "meshTest/sendMessages.groovy", server,
sender, "sendAckMessages", "AMQP");
+ evaluate(senderClassloader, "meshTest/sendMessages.groovy", sender,
sender, "sendAckMessages", "AMQP");
evaluate(senderClassloader, "journalcompatibility/ispaging.groovy");
stopServer(senderClassloader);
setVariable(receiverClassloader, "persistent", true);
- startServer(serverFolder, receiverClassloader, "journalTest", null,
false);
+ startServer(serverFolder, receiver, receiverClassloader, "journalTest",
null, false);
evaluate(receiverClassloader, "journalcompatibility/ispaging.groovy");
setVariable(receiverClassloader, "latch", null);
- evaluate(receiverClassloader, "meshTest/sendMessages.groovy", server,
receiver, "receiveMessages", "AMQP");
+ evaluate(receiverClassloader, "meshTest/sendMessages.groovy", receiver,
receiver, "receiveMessages", "AMQP");
}
/**
@@ -137,15 +130,15 @@ public class JournalCompatibilityTest extends
VersionedBase {
@TestTemplate
public void testSendReceiveQueueMetrics() throws Throwable {
setVariable(senderClassloader, "persistent", true);
- startServer(serverFolder, senderClassloader, "journalTest", null, true);
- evaluate(senderClassloader, "meshTest/sendMessages.groovy", server,
sender, "sendAckMessages");
+ startServer(serverFolder, sender, senderClassloader, "journalTest",
null, true);
+ evaluate(senderClassloader, "meshTest/sendMessages.groovy", sender,
sender, "sendAckMessages");
stopServer(senderClassloader);
setVariable(receiverClassloader, "persistent", true);
- startServer(serverFolder, receiverClassloader, "journalTest", null,
false);
+ startServer(serverFolder, receiver, receiverClassloader, "journalTest",
null, false);
setVariable(receiverClassloader, "latch", null);
- evaluate(receiverClassloader, "metrics/queueMetrics.groovy", server,
receiver, "receiveMessages");
+ evaluate(receiverClassloader, "metrics/queueMetrics.groovy", receiver,
receiver, "receiveMessages");
}
/**
@@ -156,18 +149,17 @@ public class JournalCompatibilityTest extends
VersionedBase {
public void testSendReceiveSizeQueueMetricsPaging() throws Throwable {
setVariable(senderClassloader, "persistent", true);
//Set max size to 1 to cause messages to immediately go to the paging
store
- startServer(serverFolder, senderClassloader, "journalTest",
Long.toString(1), true);
+ startServer(serverFolder, sender, senderClassloader, "journalTest",
Long.toString(1), true);
evaluate(senderClassloader, "journalcompatibility/forcepaging.groovy");
- evaluate(senderClassloader, "meshTest/sendMessages.groovy", server,
sender, "sendAckMessages");
+ evaluate(senderClassloader, "meshTest/sendMessages.groovy", sender,
sender, "sendAckMessages");
evaluate(senderClassloader, "journalcompatibility/ispaging.groovy");
stopServer(senderClassloader);
setVariable(receiverClassloader, "persistent", true);
- startServer(serverFolder, receiverClassloader, "journalTest",
Long.toString(1), false);
+ startServer(serverFolder, receiver, receiverClassloader, "journalTest",
Long.toString(1), false);
evaluate(receiverClassloader, "journalcompatibility/ispaging.groovy");
- evaluate(receiverClassloader, "metrics/queueMetrics.groovy", server,
receiver, "receiveMessages");
+ evaluate(receiverClassloader, "metrics/queueMetrics.groovy", receiver,
receiver, "receiveMessages");
}
-}
-
+}
\ No newline at end of file
diff --git
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MeshTest.java
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MeshTest.java
index 634d957c53..24f4c1eb19 100644
---
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MeshTest.java
+++
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MeshTest.java
@@ -42,21 +42,9 @@ import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(ParameterizedTestExtension.class)
public class MeshTest extends ServerBase {
- // this will ensure that all tests in this class are run twice,
- // once with "true" passed to the class' constructor and once with "false"
@Parameters(name = "server={0}, producer={1}, consumer={2}")
public static Collection getParameters() {
- // we don't need every single version ever released..
- // if we keep testing current one against 2.4 and 1.4.. we are sure the
wire and API won't change over time
List<Object[]> combinations = new ArrayList<>();
-
- /*
- // during development sometimes is useful to comment out the combinations
- // and add the ones you are interested.. example:
- */
- // combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
- // combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
-
combinations.addAll(combinatory(SNAPSHOT, new Object[]{SNAPSHOT}, new
Object[]{ONE_FOUR, TWO_FOUR, SNAPSHOT, HORNETQ_235}, new Object[]{ONE_FOUR,
TWO_FOUR, SNAPSHOT, HORNETQ_235}));
combinations.addAll(combinatory(SNAPSHOT, new Object[]{ONE_FOUR}, new
Object[]{ONE_FOUR, SNAPSHOT}, new Object[]{ONE_FOUR, SNAPSHOT}));
combinations.addAll(combinatory(SNAPSHOT, new Object[]{HORNETQ_235}, new
Object[]{ONE_FOUR, SNAPSHOT, HORNETQ_235}, new Object[]{ONE_FOUR, SNAPSHOT,
HORNETQ_235}));
diff --git
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/OldAddressSpaceTest.java
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/OldAddressSpaceTest.java
index d2e981f958..5fda3f8f30 100644
---
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/OldAddressSpaceTest.java
+++
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/OldAddressSpaceTest.java
@@ -42,7 +42,7 @@ public class OldAddressSpaceTest extends VersionedBase {
@Parameters(name = "server={0}, producer={1}, consumer={2}")
public static Collection getParameters() {
List<Object[]> combinations = new ArrayList<>();
- combinations.addAll(combinatory(new Object[]{SNAPSHOT}, new
Object[]{TWO_FOUR, SNAPSHOT}, new Object[]{TWO_FOUR, SNAPSHOT}));
+ combinations.addAll(combinatory(SNAPSHOT, new Object[]{SNAPSHOT}, new
Object[]{TWO_FOUR, SNAPSHOT}, new Object[]{TWO_FOUR, SNAPSHOT}));
return combinations;
}
diff --git
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/PagingCounterTest.java
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/PagingCounterTest.java
index cb9319d991..45c6b3fd72 100644
---
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/PagingCounterTest.java
+++
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/PagingCounterTest.java
@@ -38,33 +38,26 @@ public class PagingCounterTest extends VersionedBase {
// this will ensure that all tests in this class are run twice,
// once with "true" passed to the class' constructor and once with "false"
- @Parameters(name = "server={0}, producer={1}, consumer={2}")
+ @Parameters(name = "producer={0}, consumer={1}")
public static Collection getParameters() {
// we don't need every single version ever released..
// if we keep testing current one against 2.4 and 1.4.. we are sure the
wire and API won't change over time
List<Object[]> combinations = new ArrayList<>();
- /*
- // during development sometimes is useful to comment out the combinations
- // and add the ones you are interested.. example:
- */
- // combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
- // combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
-
if (getJavaVersion() <= 22) {
// 2.22.0 servers fail on JDK23+ without workarounds.
- combinations.add(new Object[]{null, TWO_TWENTYTWO_ZERO, SNAPSHOT});
- combinations.add(new Object[]{null, SNAPSHOT, TWO_TWENTYTWO_ZERO});
+ combinations.add(new Object[]{TWO_TWENTYTWO_ZERO, SNAPSHOT});
+ combinations.add(new Object[]{SNAPSHOT, TWO_TWENTYTWO_ZERO});
}
// the purpose on this one is just to validate the test itself.
/// if it can't run against itself it won't work at all
- combinations.add(new Object[]{null, SNAPSHOT, SNAPSHOT});
+ combinations.add(new Object[]{SNAPSHOT, SNAPSHOT});
return combinations;
}
- public PagingCounterTest(String server, String sender, String receiver)
throws Exception {
- super(server, sender, receiver);
+ public PagingCounterTest(String sender, String receiver) throws Exception {
+ super(sender, receiver);
}
@BeforeEach
@@ -88,15 +81,15 @@ public class PagingCounterTest extends VersionedBase {
@TestTemplate
public void testSendReceivePaging() throws Throwable {
setVariable(senderClassloader, "persistent", true);
- startServer(serverFolder, senderClassloader, "pageCounter", null, true);
+ startServer(serverFolder, sender, senderClassloader, "pageCounter",
null, true);
evaluate(senderClassloader, "journalcompatibility/forcepaging.groovy");
- evaluate(senderClassloader, "pageCounter/sendMessages.groovy", server,
"core", "1000");
+ evaluate(senderClassloader, "pageCounter/sendMessages.groovy", sender,
"core", "1000");
evaluate(senderClassloader, "journalcompatibility/ispaging.groovy");
evaluate(senderClassloader, "pageCounter/checkMessages.groovy", "1000");
stopServer(senderClassloader);
setVariable(receiverClassloader, "persistent", true);
- startServer(serverFolder, receiverClassloader, "pageCounter", null,
false);
+ startServer(serverFolder, receiver, receiverClassloader, "pageCounter",
null, false);
evaluate(receiverClassloader, "journalcompatibility/ispaging.groovy");
evaluate(receiverClassloader, "pageCounter/checkMessages.groovy",
"1000");
diff --git
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/PrefixSendAckTest.java
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/PrefixSendAckTest.java
index 298b686a67..12d4d63a8b 100644
---
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/PrefixSendAckTest.java
+++
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/PrefixSendAckTest.java
@@ -38,7 +38,7 @@ public class PrefixSendAckTest extends ServerBase {
public static Collection getParameters() {
List<Object[]> combinations = new ArrayList<>();
- combinations.addAll(combinatory(new Object[]{SNAPSHOT}, new
Object[]{ONE_FOUR, HORNETQ_247, TWO_FOUR, SNAPSHOT}, new Object[]{ONE_FOUR,
HORNETQ_247, TWO_FOUR, SNAPSHOT}));
+ combinations.addAll(combinatory(SNAPSHOT, new Object[]{SNAPSHOT}, new
Object[]{ONE_FOUR, HORNETQ_247, TWO_FOUR, SNAPSHOT}, new Object[]{ONE_FOUR,
HORNETQ_247, TWO_FOUR, SNAPSHOT}));
return combinations;
}
diff --git
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/QueuePauseJournalCompatibilityTest.java
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/QueuePauseJournalCompatibilityTest.java
index 1d1548511c..174c6a5b7d 100644
---
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/QueuePauseJournalCompatibilityTest.java
+++
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/QueuePauseJournalCompatibilityTest.java
@@ -38,28 +38,21 @@ public class QueuePauseJournalCompatibilityTest extends
VersionedBase {
// this will ensure that all tests in this class are run twice,
// once with "true" passed to the class' constructor and once with "false"
- @Parameters(name = "server={0}, producer={1}, consumer={2}")
+ @Parameters(name = "producer={0}, consumer={1}")
public static Collection getParameters() {
// we don't need every single version ever released..
// if we keep testing current one against 2.4 and 1.4.. we are sure the
wire and API won't change over time
List<Object[]> combinations = new ArrayList<>();
- /*
- // during development sometimes is useful to comment out the combinations
- // and add the ones you are interested.. example:
- */
- // combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
- // combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
-
- combinations.add(new Object[]{null, TWO_SIX_THREE, SNAPSHOT});
+ combinations.add(new Object[]{TWO_SIX_THREE, SNAPSHOT});
// the purpose on this one is just to validate the test itself.
/// if it can't run against itself it won't work at all
- combinations.add(new Object[]{null, SNAPSHOT, SNAPSHOT});
+ combinations.add(new Object[]{SNAPSHOT, SNAPSHOT});
return combinations;
}
- public QueuePauseJournalCompatibilityTest(String server, String sender,
String receiver) throws Exception {
- super(server, sender, receiver);
+ public QueuePauseJournalCompatibilityTest(String sender, String receiver)
throws Exception {
+ super(sender, receiver);
}
@BeforeEach
@@ -87,18 +80,18 @@ public class QueuePauseJournalCompatibilityTest extends
VersionedBase {
public void internal(String destinationName) throws Throwable {
setVariable(senderClassloader, "persistent", true);
- startServer(serverFolder, senderClassloader, "journalTest", null, true);
+ startServer(serverFolder, sender, senderClassloader, "journalTest",
null, true);
evaluate(senderClassloader, "queuepause/beforestop.groovy",
destinationName);
stopServer(senderClassloader);
setVariable(receiverClassloader, "persistent", true);
- startServer(serverFolder, receiverClassloader, "journalTest", null,
false);
+ startServer(serverFolder, receiver, receiverClassloader, "journalTest",
null, false);
evaluate(receiverClassloader, "queuepause/afterstop.groovy",
destinationName);
stopServer(receiverClassloader);
// on a third try, we run the beforestop again, as the address should
been in regular conditions when aftertop.groovy is finished
setVariable(receiverClassloader, "persistent", true);
- startServer(serverFolder, receiverClassloader, "journalTest", null,
false);
+ startServer(serverFolder, receiver, receiverClassloader, "journalTest",
null, false);
evaluate(receiverClassloader, "queuepause/beforestop.groovy",
destinationName);
}
}
diff --git
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ReplyToTest.java
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ReplyToTest.java
index 14fddbe2bf..c5fc69b7f8 100644
---
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ReplyToTest.java
+++
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ReplyToTest.java
@@ -55,7 +55,7 @@ public class ReplyToTest extends ServerBase {
stream.close();
setVariable(serverClassloader, "persistent", Boolean.FALSE);
- startServer(serverFolder, serverClassloader, "live");
+ startServer(serverFolder, server, serverClassloader, "live");
}
@AfterEach
@@ -92,21 +92,10 @@ public class ReplyToTest extends ServerBase {
}
}
- // this will ensure that all tests in this class are run twice,
- // once with "true" passed to the class' constructor and once with "false"
@Parameters(name = "server={0}, producer={1}, consumer={2}")
public static Collection getParameters() {
- // we don't need every single version ever released..
- // if we keep testing current one against 2.4 and 1.4.. we are sure the
wire and API won't change over time
List<Object[]> combinations = new ArrayList<>();
- /*
- // during development sometimes is useful to comment out the combinations
- // and add the ones you are interested.. example:
- */
- // combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
- // combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
-
combinations.add(new Object[]{SNAPSHOT, TWO_FOUR, TWO_FOUR});
combinations.add(new Object[]{TWO_FOUR, SNAPSHOT, SNAPSHOT});
diff --git
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SendAckTest.java
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SendAckTest.java
index 828f35ff9e..2041844476 100644
---
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SendAckTest.java
+++
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SendAckTest.java
@@ -35,24 +35,12 @@ import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(ParameterizedTestExtension.class)
public class SendAckTest extends ServerBase {
- // this will ensure that all tests in this class are run twice,
- // once with "true" passed to the class' constructor and once with "false"
@Parameters(name = "server={0}, producer={1}, consumer={2}")
public static Collection getParameters() {
- // we don't need every single version ever released..
- // if we keep testing current one against 2.4 and 1.4.. we are sure the
wire and API won't change over time
List<Object[]> combinations = new ArrayList<>();
- /*
- // during development sometimes is useful to comment out the combinations
- // and add the ones you are interested.. example:
- */
- // combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
- // combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
+ combinations.addAll(combinatory(SNAPSHOT, new Object[]{SNAPSHOT,
ONE_FOUR}, new Object[]{ONE_FOUR, SNAPSHOT}, new Object[]{ONE_FOUR, SNAPSHOT}));
- combinations.addAll(combinatory(new Object[]{SNAPSHOT, ONE_FOUR}, new
Object[]{ONE_FOUR, SNAPSHOT}, new Object[]{ONE_FOUR, SNAPSHOT}));
-
- // not every combination on two four would make sense.. as there's a
compatibility issue between 2.4 and 1.4 when crossing consumers and producers
combinations.add(new Object[]{TWO_FOUR, SNAPSHOT, SNAPSHOT});
combinations.add(new Object[]{SNAPSHOT, TWO_FOUR, TWO_FOUR});
combinations.add(new Object[]{HORNETQ_247, SNAPSHOT, SNAPSHOT});
diff --git
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SerializationTest.java
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SerializationTest.java
index b0e52552db..203c686b04 100644
---
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SerializationTest.java
+++
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SerializationTest.java
@@ -43,26 +43,19 @@ public class SerializationTest extends VersionedBase {
// this will ensure that all tests in this class are run twice,
// once with "true" passed to the class' constructor and once with "false"
- @Parameters(name = "server={0}, producer={1}, consumer={2}")
+ @Parameters(name = "producer={0}, consumer={1}")
public static Collection getParameters() {
// we don't need every single version ever released..
// if we keep testing current one against 2.4 and 1.4.. we are sure the
wire and API won't change over time
List<Object[]> combinations = new ArrayList<>();
- /*
- // during development sometimes is useful to comment out the combinations
- // and add the ones you are interested.. example:
- */
- // combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
- // combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
-
- combinations.add(new Object[] {null, TWO_TEN_ZERO, SNAPSHOT});
- combinations.add(new Object[] {null, SNAPSHOT, TWO_TEN_ZERO});
+ combinations.add(new Object[] {TWO_TEN_ZERO, SNAPSHOT});
+ combinations.add(new Object[] {SNAPSHOT, TWO_TEN_ZERO});
return combinations;
}
- public SerializationTest(String server, String sender, String receiver)
throws Exception {
- super(server, sender, receiver);
+ public SerializationTest(String sender, String receiver) throws Exception {
+ super(sender, receiver);
}
@BeforeEach
@@ -70,7 +63,7 @@ public class SerializationTest extends VersionedBase {
FileUtil.deleteDirectory(serverFolder);
serverFolder.mkdirs();
setVariable(senderClassloader, "persistent", false);
- startServer(serverFolder, senderClassloader, "1");
+ startServer(serverFolder, sender, senderClassloader, "1");
}
@AfterEach
diff --git
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/ServerBase.java
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/ServerBase.java
index 6fb4bdb4d3..b3a973bc0c 100644
---
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/ServerBase.java
+++
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/ServerBase.java
@@ -31,7 +31,7 @@ public class ServerBase extends VersionedBase {
public void setUp() throws Throwable {
FileUtil.deleteDirectory(serverFolder);
setVariable(serverClassloader, "persistent", Boolean.FALSE);
- startServer(serverFolder, serverClassloader, "live");
+ startServer(serverFolder, server, serverClassloader, "live");
}
@AfterEach
diff --git
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/VersionedBase.java
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/VersionedBase.java
index 3e2ddc5fe6..64167d7588 100644
---
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/VersionedBase.java
+++
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/VersionedBase.java
@@ -21,6 +21,8 @@ import java.io.File;
import java.util.LinkedList;
import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public abstract class VersionedBase extends ClasspathBase {
protected final String server;
@@ -31,10 +33,19 @@ public abstract class VersionedBase extends ClasspathBase {
protected final ClassLoader senderClassloader;
protected final ClassLoader receiverClassloader;
+ // for tests that don't use a server classLoader
+ public VersionedBase(String sender, String receiver) throws Exception {
+ this.sender = sender;
+ this.receiver = receiver;
+ this.senderClassloader = getClasspath(sender);
+ this.receiverClassloader = getClasspath(receiver);
+ clearGroovy(senderClassloader);
+ clearGroovy(receiverClassloader);
+ this.server = null;
+ this.serverClassloader = null;
+ }
+
public VersionedBase(String server, String sender, String receiver) throws
Exception {
- if (server == null) {
- server = sender;
- }
this.server = server;
this.sender = sender;
this.receiver = receiver;
@@ -46,8 +57,17 @@ public abstract class VersionedBase extends ClasspathBase {
clearGroovy(serverClassloader);
}
- protected static List<Object[]> combinatory(Object[] rootSide, Object[]
sideLeft, Object[] sideRight) {
- return combinatory(null, rootSide, sideLeft, sideRight);
+
+ protected static List<Object[]> combinatory2(Object required, Object[]
sideLeft, Object[] sideRight) {
+ LinkedList<Object[]> combinations = new LinkedList<>();
+ for (Object left : sideLeft) {
+ for (Object right : sideRight) {
+ if (left.equals(required) || right.equals(required)) {
+ combinations.add(new Object[]{left, right});
+ }
+ }
+ }
+ return combinations;
}
protected static List<Object[]> combinatory(Object required,
@@ -66,10 +86,13 @@ public abstract class VersionedBase extends ClasspathBase {
Object[] rootSide,
Object[] sideLeft,
Object[] sideRight) {
+
+ assertNotNull(required);
+
for (Object root : rootSide) {
for (Object left : sideLeft) {
for (Object right : sideRight) {
- if (required == null || root.equals(required) ||
left.equals(required) || right.equals(required)) {
+ if (root.equals(required) || left.equals(required) ||
right.equals(required)) {
combinations.add(new Object[]{root, left, right});
}
}
@@ -77,16 +100,17 @@ public abstract class VersionedBase extends ClasspathBase {
}
}
- public void startServer(File folder, ClassLoader loader, String serverName)
throws Throwable {
- startServer(folder, loader, serverName, null);
+ public void startServer(File folder, String serverVersion, ClassLoader
loader, String serverName) throws Throwable {
+ startServer(folder, serverVersion, loader, serverName, null);
}
- public void startServer(File folder, ClassLoader loader, String serverName,
String globalMaxSize) throws Throwable {
- startServer(folder, loader, serverName, globalMaxSize, false);
+ public void startServer(File folder, String serverVersion, ClassLoader
loader, String serverName, String globalMaxSize) throws Throwable {
+ startServer(folder, serverVersion, loader, serverName, globalMaxSize,
false);
}
public void startServer(File folder,
+ String serverVersion,
ClassLoader loader,
String serverName,
String globalMaxSize,
@@ -96,13 +120,13 @@ public abstract class VersionedBase extends ClasspathBase {
String scriptToUse;
if (getServerScriptToUse() != null && !getServerScriptToUse().isEmpty())
{
scriptToUse = getServerScriptToUse();
- } else if (server.startsWith("ARTEMIS")) {
+ } else if (serverVersion.startsWith("ARTEMIS")) {
scriptToUse = "servers/artemisServer.groovy";
} else {
scriptToUse = "servers/hornetqServer.groovy";
}
- startServer(folder, loader, serverName, globalMaxSize,
setAddressSettings, scriptToUse, server, sender, receiver);
+ startServer(folder, loader, serverName, globalMaxSize,
setAddressSettings, scriptToUse, serverVersion, sender, receiver);
}
public String getServerScriptToUse() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
