You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2023/01/08 04:54:22 UTC
[activemq-artemis] branch main updated: ARTEMIS-3707 fixing tests
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new bf1d81e09e ARTEMIS-3707 fixing tests
bf1d81e09e is described below
commit bf1d81e09ec97e6aca723bc1ade6210c5843753d
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Tue Dec 20 13:18:12 2022 -0600
ARTEMIS-3707 fixing tests
A handful of tests started to fail after the original fix was committed.
This commit fixes those failures mainly by using a mock
`TransactionSynchronizationRegistry`.
I changed `o.a.a.a.r.ActiveMQRAManagedConnection#checkTransactionActive`
slightly because `getTransactionStatus` will never return `null` unlike
`getTransaction` would. The semantics should still be the same, though.
---
.../artemis/ra/ActiveMQRAManagedConnection.java | 39 ++++++++-----
.../ra/ActiveMQMessageHandlerXATest.java | 8 ++-
.../tests/integration/ra/ActiveMQRATestBase.java | 8 ++-
.../DummyTransactionSynchronizationRegistry.java | 66 ++++++++++++++++++++++
.../tests/integration/ra/IgnoreJTATest.java | 4 +-
.../tests/integration/ra/JMSContextTest.java | 23 ++++----
.../integration/ra/OutgoingConnectionJTATest.java | 20 +++----
7 files changed, 121 insertions(+), 47 deletions(-)
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnection.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnection.java
index a1b9e27089..4043f94c64 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnection.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnection.java
@@ -16,18 +16,6 @@
*/
package org.apache.activemq.artemis.ra;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.locks.ReentrantLock;
-
import javax.jms.ExceptionListener;
import javax.jms.JMSException;
import javax.jms.ResourceAllocationException;
@@ -46,6 +34,18 @@ import javax.security.auth.Subject;
import javax.transaction.Status;
import javax.transaction.TransactionSynchronizationRegistry;
import javax.transaction.xa.XAResource;
+import java.io.PrintWriter;
+import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.ReentrantLock;
import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
import org.apache.activemq.artemis.jms.client.ActiveMQConnection;
@@ -56,7 +56,6 @@ import org.apache.activemq.artemis.service.extensions.xa.ActiveMQXAResourceWrapp
import org.apache.activemq.artemis.utils.VersionLoader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.lang.invoke.MethodHandles;
/**
* The managed connection
@@ -340,8 +339,18 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
if (!inManagedTx && tsr != null) {
int status = tsr.getTransactionStatus();
// Only allow states that will actually succeed
- if (status != Status.STATUS_ACTIVE && status != Status.STATUS_PREPARING && status != Status.STATUS_PREPARED && status != Status.STATUS_COMMITTING) {
- throw new javax.jms.IllegalStateException("Transaction " + tsr.getTransactionKey() + " not active");
+ if (status == Status.STATUS_COMMITTED || status == Status.STATUS_MARKED_ROLLBACK || status == Status.STATUS_ROLLEDBACK || status == Status.STATUS_ROLLING_BACK) {
+ String statusMessage = "";
+ if (status == Status.STATUS_COMMITTED) {
+ statusMessage = "committed";
+ } else if (status == Status.STATUS_MARKED_ROLLBACK) {
+ statusMessage = "marked for rollback";
+ } else if (status == Status.STATUS_ROLLEDBACK) {
+ statusMessage = "rolled back";
+ } else if (status == Status.STATUS_ROLLING_BACK) {
+ statusMessage = "rolling back";
+ }
+ throw new javax.jms.IllegalStateException("Transaction is " + statusMessage);
}
}
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerXATest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerXATest.java
index f686247647..d6f0c1e6d0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerXATest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerXATest.java
@@ -19,6 +19,8 @@ package org.apache.activemq.artemis.tests.integration.ra;
import javax.jms.Message;
import javax.resource.ResourceException;
import javax.resource.spi.ApplicationServerInternalException;
+import javax.transaction.Status;
+import javax.transaction.TransactionSynchronizationRegistry;
import javax.transaction.xa.XAException;
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
@@ -79,7 +81,8 @@ public class ActiveMQMessageHandlerXATest extends ActiveMQRATestBase {
@Test
public void testXABeginFails() throws Exception {
ActiveMQResourceAdapter qResourceAdapter = newResourceAdapter();
- MyBootstrapContext ctx = new MyBootstrapContext();
+ TransactionSynchronizationRegistry tsr = new DummyTransactionSynchronizationRegistry().setStatus(Status.STATUS_ACTIVE);
+ MyBootstrapContext ctx = new MyBootstrapContext().setTransactionSynchronizationRegistry(tsr);
qResourceAdapter.start(ctx);
ActiveMQActivationSpec spec = new ActiveMQActivationSpec();
spec.setResourceAdapter(qResourceAdapter);
@@ -99,8 +102,7 @@ public class ActiveMQMessageHandlerXATest extends ActiveMQRATestBase {
session.close();
latch.await(5, TimeUnit.SECONDS);
- DummyTransaction transaction = (DummyTransaction) ServiceUtils.getTransactionManager().getTransaction();
- assertTrue(transaction.rollbackOnly);
+ assertTrue(tsr.getRollbackOnly());
assertTrue(endpoint.afterDelivery);
qResourceAdapter.endpointDeactivation(endpointFactory, spec);
qResourceAdapter.stop();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQRATestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQRATestBase.java
index 81c59e5f31..0342672e84 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQRATestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQRATestBase.java
@@ -173,6 +173,12 @@ public abstract class ActiveMQRATestBase extends JMSTestBase {
}
public class MyBootstrapContext implements BootstrapContext {
+ TransactionSynchronizationRegistry tsr = null;
+
+ public MyBootstrapContext setTransactionSynchronizationRegistry(TransactionSynchronizationRegistry tsr) {
+ this.tsr = tsr;
+ return this;
+ }
WorkManager workManager = new DummyWorkManager();
@@ -188,7 +194,7 @@ public abstract class ActiveMQRATestBase extends JMSTestBase {
@Override
public TransactionSynchronizationRegistry getTransactionSynchronizationRegistry() {
- return null;
+ return tsr;
}
@Override
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/DummyTransactionSynchronizationRegistry.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/DummyTransactionSynchronizationRegistry.java
new file mode 100644
index 0000000000..d06b83911a
--- /dev/null
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/DummyTransactionSynchronizationRegistry.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.tests.integration.ra;
+
+import javax.transaction.Status;
+import javax.transaction.Synchronization;
+import javax.transaction.TransactionSynchronizationRegistry;
+
+public class DummyTransactionSynchronizationRegistry implements TransactionSynchronizationRegistry {
+ private int status = Status.STATUS_NO_TRANSACTION;
+ private boolean rollbackOnly = false;
+
+ public DummyTransactionSynchronizationRegistry setStatus(int status) {
+ this.status = status;
+ return this;
+ }
+
+ @Override
+ public Object getTransactionKey() {
+ return null;
+ }
+
+ @Override
+ public void putResource(Object key, Object value) {
+
+ }
+
+ @Override
+ public Object getResource(Object key) {
+ return null;
+ }
+
+ @Override
+ public void registerInterposedSynchronization(Synchronization sync) {
+
+ }
+
+ @Override
+ public int getTransactionStatus() {
+ return status;
+ }
+
+ @Override
+ public void setRollbackOnly() {
+ rollbackOnly = true;
+ }
+
+ @Override
+ public boolean getRollbackOnly() {
+ return rollbackOnly;
+ }
+}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/IgnoreJTATest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/IgnoreJTATest.java
index c4a6b62d6e..4c8f09d8c2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/IgnoreJTATest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/IgnoreJTATest.java
@@ -37,6 +37,7 @@ import javax.jms.Queue;
import javax.jms.QueueConnection;
import javax.jms.Session;
import javax.jms.TextMessage;
+import javax.transaction.Status;
public class IgnoreJTATest extends ActiveMQRATestBase {
@@ -90,13 +91,12 @@ public class IgnoreJTATest extends ActiveMQRATestBase {
}
private void testSendAndReceive(Boolean ignoreJTA) throws Exception {
- setDummyTX();
setupDLQ(10);
resourceAdapter = newResourceAdapter();
if (ignoreJTA != null) {
resourceAdapter.setIgnoreJTA(ignoreJTA);
}
- MyBootstrapContext ctx = new MyBootstrapContext();
+ MyBootstrapContext ctx = new MyBootstrapContext().setTransactionSynchronizationRegistry(new DummyTransactionSynchronizationRegistry().setStatus(Status.STATUS_ACTIVE));
resourceAdapter.start(ctx);
ActiveMQRAManagedConnectionFactory mcf = new ActiveMQRAManagedConnectionFactory();
mcf.setResourceAdapter(resourceAdapter);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/JMSContextTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/JMSContextTest.java
index 658b3239fa..463fe863a4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/JMSContextTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/JMSContextTest.java
@@ -23,7 +23,8 @@ import javax.jms.JMSRuntimeException;
import javax.jms.MessageFormatRuntimeException;
import javax.jms.Queue;
import javax.jms.TextMessage;
-import javax.transaction.TransactionManager;
+import javax.resource.ResourceException;
+import javax.transaction.Status;
import java.util.HashSet;
import java.util.Set;
@@ -34,7 +35,6 @@ import org.apache.activemq.artemis.ra.ActiveMQRAConnectionFactoryImpl;
import org.apache.activemq.artemis.ra.ActiveMQRAConnectionManager;
import org.apache.activemq.artemis.ra.ActiveMQRAManagedConnectionFactory;
import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter;
-import org.apache.activemq.artemis.service.extensions.ServiceUtils;
import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager;
import org.junit.After;
import org.junit.Before;
@@ -43,18 +43,13 @@ import org.junit.Test;
public class JMSContextTest extends ActiveMQRATestBase {
private ActiveMQResourceAdapter resourceAdapter;
-
+ private DummyTransactionSynchronizationRegistry tsr;
ActiveMQRAConnectionManager qraConnectionManager = new ActiveMQRAConnectionManager();
private ActiveMQRAConnectionFactory qraConnectionFactory;
- public TransactionManager getTm() {
- return DummyTransactionManager.tm;
- }
-
@Override
@Before
public void setUp() throws Exception {
- useDummyTransactionManager();
super.setUp();
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("testuser", "testpassword");
@@ -67,19 +62,21 @@ public class JMSContextTest extends ActiveMQRATestBase {
roles.add(role);
server.getSecurityRepository().addMatch(MDBQUEUEPREFIXED, roles);
resourceAdapter = new ActiveMQResourceAdapter();
-
resourceAdapter.setConnectorClassName(InVMConnectorFactory.class.getName());
- MyBootstrapContext ctx = new MyBootstrapContext();
+ tsr = new DummyTransactionSynchronizationRegistry();
+ MyBootstrapContext ctx = new MyBootstrapContext().setTransactionSynchronizationRegistry(tsr);
resourceAdapter.start(ctx);
ActiveMQRAManagedConnectionFactory mcf = new ActiveMQRAManagedConnectionFactory();
mcf.setResourceAdapter(resourceAdapter);
qraConnectionFactory = new ActiveMQRAConnectionFactoryImpl(mcf, qraConnectionManager);
}
+ private void initRA(int status) throws ResourceException {
+ }
+
@Override
@After
public void tearDown() throws Exception {
- DummyTransactionManager.tm.tx = null;
if (resourceAdapter != null) {
resourceAdapter.stop();
}
@@ -126,7 +123,7 @@ public class JMSContextTest extends ActiveMQRATestBase {
@Test
public void sessionTransactedTestNoActiveJTATx() throws Exception {
- ((DummyTransactionManager) ServiceUtils.getTransactionManager()).tx = new DummyTransaction();
+ tsr.setStatus(Status.STATUS_ACTIVE);
JMSContext context = qraConnectionFactory.createContext(JMSContext.SESSION_TRANSACTED);
assertEquals(context.getSessionMode(), JMSContext.AUTO_ACKNOWLEDGE);
}
@@ -143,7 +140,7 @@ public class JMSContextTest extends ActiveMQRATestBase {
@Test
public void clientAckTestNoActiveJTATx() throws Exception {
- ((DummyTransactionManager) ServiceUtils.getTransactionManager()).tx = new DummyTransaction();
+ tsr.setStatus(Status.STATUS_ACTIVE);
JMSContext context = qraConnectionFactory.createContext(JMSContext.CLIENT_ACKNOWLEDGE);
assertEquals(context.getSessionMode(), JMSContext.AUTO_ACKNOWLEDGE);
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionJTATest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionJTATest.java
index 3a6bb03bd5..11f61f50b4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionJTATest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionJTATest.java
@@ -28,6 +28,7 @@ import javax.jms.Queue;
import javax.jms.QueueConnection;
import javax.jms.Session;
import javax.jms.TextMessage;
+import javax.transaction.Status;
import java.util.HashSet;
import java.util.Set;
@@ -43,7 +44,6 @@ import org.apache.activemq.artemis.ra.ActiveMQRAConnectionFactoryImpl;
import org.apache.activemq.artemis.ra.ActiveMQRAConnectionManager;
import org.apache.activemq.artemis.ra.ActiveMQRAManagedConnectionFactory;
import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter;
-import org.apache.activemq.artemis.service.extensions.ServiceUtils;
import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager;
import org.junit.After;
import org.junit.Before;
@@ -54,6 +54,7 @@ public class OutgoingConnectionJTATest extends ActiveMQRATestBase {
protected ActiveMQResourceAdapter resourceAdapter;
protected ActiveMQRAConnectionFactory qraConnectionFactory;
protected ActiveMQRAManagedConnectionFactory mcf;
+ private DummyTransactionSynchronizationRegistry tsr;
ActiveMQRAConnectionManager qraConnectionManager = new ActiveMQRAConnectionManager();
@Override
@@ -64,7 +65,6 @@ public class OutgoingConnectionJTATest extends ActiveMQRATestBase {
@Override
@Before
public void setUp() throws Exception {
- useDummyTransactionManager();
super.setUp();
((ActiveMQJAASSecurityManager) server.getSecurityManager()).getConfiguration().addUser("testuser", "testpassword");
((ActiveMQJAASSecurityManager) server.getSecurityManager()).getConfiguration().addUser("guest", "guest");
@@ -75,12 +75,11 @@ public class OutgoingConnectionJTATest extends ActiveMQRATestBase {
Set<Role> roles = new HashSet<>();
roles.add(role);
server.getSecurityRepository().addMatch(MDBQUEUEPREFIXED, roles);
-
resourceAdapter = new ActiveMQResourceAdapter();
resourceAdapter.setEntries("[\"java://jmsXA\"]");
-
resourceAdapter.setConnectorClassName(InVMConnectorFactory.class.getName());
- MyBootstrapContext ctx = new MyBootstrapContext();
+ tsr = new DummyTransactionSynchronizationRegistry();
+ MyBootstrapContext ctx = new MyBootstrapContext().setTransactionSynchronizationRegistry(tsr);
resourceAdapter.start(ctx);
mcf = new ActiveMQRAManagedConnectionFactory();
mcf.setResourceAdapter(resourceAdapter);
@@ -90,7 +89,6 @@ public class OutgoingConnectionJTATest extends ActiveMQRATestBase {
@Override
@After
public void tearDown() throws Exception {
- ((DummyTransactionManager) ServiceUtils.getTransactionManager()).tx = null;
if (resourceAdapter != null) {
resourceAdapter.stop();
}
@@ -101,10 +99,10 @@ public class OutgoingConnectionJTATest extends ActiveMQRATestBase {
@Test
public void testSimpleMessageSendAndReceiveTransacted() throws Exception {
- setDummyTX();
+ tsr.setStatus(Status.STATUS_ACTIVE);
setupDLQ(10);
resourceAdapter = newResourceAdapter();
- MyBootstrapContext ctx = new MyBootstrapContext();
+ MyBootstrapContext ctx = new MyBootstrapContext().setTransactionSynchronizationRegistry(tsr);
resourceAdapter.start(ctx);
ActiveMQRAManagedConnectionFactory mcf = new ActiveMQRAManagedConnectionFactory();
mcf.setResourceAdapter(resourceAdapter);
@@ -130,7 +128,7 @@ public class OutgoingConnectionJTATest extends ActiveMQRATestBase {
public void testQueuSessionAckMode(boolean inTx) throws Exception {
if (inTx) {
- setDummyTX();
+ tsr.setStatus(Status.STATUS_ACTIVE);
}
QueueConnection queueConnection = qraConnectionFactory.createQueueConnection();
@@ -249,8 +247,4 @@ public class OutgoingConnectionJTATest extends ActiveMQRATestBase {
assertEquals("hello", msg.getStringProperty("strvalue"));
}
}
-
- private void setDummyTX() {
- ((DummyTransactionManager) ServiceUtils.getTransactionManager()).tx = new DummyTransaction();
- }
}