This is an automated email from the ASF dual-hosted git repository.
vavrtom pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new f944601b82 QPID-8615: [Broker-J] JUnit 5 migration (#221)
f944601b82 is described below
commit f944601b82053e23a32df16d087829169c34c439
Author: Daniil Kirilyuk <daniel.kiril...@gmail.com>
AuthorDate: Thu Aug 24 07:56:11 2023 +0200
QPID-8615: [Broker-J] JUnit 5 migration (#221)
Fixes system tests failure in MultiNodeTest and BDBUpgradeTest
---
.../server/store/berkeleydb/BDBUpgradeTest.java | 7 ++---
.../berkeleydb/replication/GroupJmsTestBase.java | 36 ++++++++++------------
2 files changed, 19 insertions(+), 24 deletions(-)
diff --git
a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
index 724c37834f..deda92de75 100644
---
a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
+++
b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
@@ -29,6 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.util.Collection;
@@ -68,13 +69,11 @@ import org.apache.qpid.tests.utils.ConfigItem;
* <p>
* Store prepared using old client/broker with BDBStoreUpgradeTestPreparer.
*/
-@ConfigItem(name = "qpid.initialConfigurationLocation", value =
DEFAULT_BROKER_CONFIG )
+@ConfigItem(name = "qpid.initialConfigurationLocation", value =
DEFAULT_BROKER_CONFIG)
public class BDBUpgradeTest extends UpgradeTestBase
{
-
private static final String STRING_1024 = generateString(1024);
private static final String STRING_1024_256 = generateString(1024 * 256);
-
private static final String TOPIC_NAME = "myUpgradeTopic";
private static final String SUB_NAME = "myDurSubName";
private static final String SELECTOR_SUB_NAME = "mySelectorDurSubName";
@@ -88,7 +87,7 @@ public class BDBUpgradeTest extends UpgradeTestBase
{
assumeTrue("BDB".equals(System.getProperty("virtualhostnode.type",
"BDB")),
"System property 'virtualhostnode.type' should be 'BDB'");
- assumeTrue(Objects.equal(getProtocol(), Protocol.AMQP_1_0), "AMQP
protocol should be 1.0");
+ assumeFalse(Objects.equal(getProtocol(), Protocol.AMQP_1_0), "AMQP
protocol should be 1.0");
}
/**
diff --git
a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupJmsTestBase.java
b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupJmsTestBase.java
index f9d27194af..7d72b07a97 100644
---
a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupJmsTestBase.java
+++
b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupJmsTestBase.java
@@ -36,28 +36,26 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.extension.BeforeAllCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.TestInstance;
import org.apache.qpid.systests.ConnectionBuilder;
import org.apache.qpid.systests.JmsProvider;
import org.apache.qpid.systests.Utils;
-import org.apache.qpid.test.utils.UnitTestBase;
-public class GroupJmsTestBase extends UnitTestBase
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+public class GroupJmsTestBase
{
private static final int FAILOVER_CYCLECOUNT = 40;
private static final int FAILOVER_CONNECTDELAY = 1000;
static final int SHORT_FAILOVER_CYCLECOUNT = 2;
static final int SHORT_FAILOVER_CONNECTDELAY = 200;
+ private static final AtomicReference<Class<?>> _testClass = new
AtomicReference<>();
- private static final Logger LOGGER =
LoggerFactory.getLogger(GroupJmsTestBase.class);
private static JmsProvider _jmsProvider;
private static GroupBrokerAdmin _groupBrokerAdmin;
- private static AtomicReference<Class<?>> _testClass = new
AtomicReference<>();
+
+ private String _testName;
@BeforeAll
public static void setUpTestBase()
@@ -78,26 +76,24 @@ public class GroupJmsTestBase extends UnitTestBase
}
}
- @RegisterExtension
- public final BeforeAllCallback resource = (ExtensionContext ctx) ->
+ @BeforeEach
+ public void beforeTestMethod(final TestInfo testInfo) throws Exception
{
if (_testClass.compareAndSet(null, GroupJmsTestBase.this.getClass() ))
{
_groupBrokerAdmin = new GroupBrokerAdmin();
_groupBrokerAdmin.beforeTestClass(GroupJmsTestBase.this.getClass());
}
- };
-
- @BeforeEach
- public void beforeTestMethod() throws Exception
- {
- _groupBrokerAdmin.beforeTestMethod(getClass(),
getClass().getMethod(getTestName()));
+ _testName = testInfo.getTestMethod()
+ .orElseThrow(() -> new RuntimeException("Failed to resolve
test method"))
+ .getName();
+ _groupBrokerAdmin.beforeTestMethod(getClass(),
getClass().getMethod(_testName));
}
@AfterEach
public void afterTestMethod() throws Exception
{
- _groupBrokerAdmin.afterTestMethod(getClass(),
getClass().getMethod(getTestName()));
+ _groupBrokerAdmin.afterTestMethod(getClass(),
getClass().getMethod(_testName));
}
GroupBrokerAdmin getBrokerAdmin()
@@ -108,7 +104,7 @@ public class GroupJmsTestBase extends UnitTestBase
ConnectionBuilder getConnectionBuilder()
{
final ConnectionBuilder connectionBuilder =
_jmsProvider.getConnectionBuilder()
-
.setClientId(getTestName())
+
.setClientId(_testName)
.setFailoverReconnectDelay(FAILOVER_CONNECTDELAY)
.setFailoverReconnectAttempts(FAILOVER_CYCLECOUNT)
.setVirtualHost("test")
@@ -154,7 +150,7 @@ public class GroupJmsTestBase extends UnitTestBase
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
try
{
- return getJmsProvider().createQueue(session, getTestName());
+ return getJmsProvider().createQueue(session, _testName);
}
finally
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
