You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cs...@apache.org on 2022/03/08 18:29:53 UTC
[activemq] branch main updated: AMQ-8528: Fix test failures in integration module
This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/main by this push:
new 32e72b0 AMQ-8528: Fix test failures in integration module
new 6f907c4 Merge pull request #795 from cshannon/AMQ-8528
32e72b0 is described below
commit 32e72b0879713bb017bd258efddfa18355504123
Author: Christopher L. Shannon <ch...@gmail.com>
AuthorDate: Mon Mar 7 19:24:39 2022 -0500
AMQ-8528: Fix test failures in integration module
-DurableFiveBrokerNetworkBridgeTest: Fix refactoring mistake
-SpringTest: Fix Spring xml files
-BrokerRedeliveryTest: Fix after sendDuplicateFromStoreToDLQ default
changed to false
-AMQ4952Test: Fix after sendDuplicateFromStoreToDLQ default
changed to false
-AMQ3537Test: Add missing package to SERIALIZABLE_PACKAGES
-OfflineDurableSubscriberTimeoutTest: Fix after log4j2 update
-JDBCConcurrentDLQTest: Fix after log4j2 update
---
activemq-unit-tests/pom.xml | 5 +++++
.../test/java/org/apache/activemq/broker/BrokerRedeliveryTest.java | 1 +
.../src/test/java/org/apache/activemq/bugs/AMQ3537Test.java | 2 +-
.../src/test/java/org/apache/activemq/bugs/AMQ4952Test.java | 1 +
.../apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java | 1 +
.../java/org/apache/activemq/store/jdbc/JDBCConcurrentDLQTest.java | 3 ++-
.../activemq/usecases/OfflineDurableSubscriberTimeoutTest.java | 3 ++-
.../src/test/resources/spring-embedded-xbean-local.xml | 2 +-
activemq-unit-tests/src/test/resources/spring-embedded-xbean.xml | 2 +-
activemq-unit-tests/src/test/resources/spring-embedded.xml | 2 +-
activemq-unit-tests/src/test/resources/spring-queue.xml | 2 +-
activemq-unit-tests/src/test/resources/spring.xml | 2 +-
12 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml
index 6c53234..275f405 100644
--- a/activemq-unit-tests/pom.xml
+++ b/activemq-unit-tests/pom.xml
@@ -1074,6 +1074,11 @@
<exclude>org/apache/activemq/store/kahadb/disk/util/DataByteArrayInputStreamTest.*</exclude>
<exclude>org/apache/activemq/bugs/AMQ5266StarvedConsumerTest.*</exclude>
<exclude>org/apache/activemq/bugs/AMQ5266Test.*</exclude>
+
+ <!--Broken tests -->
+ <exclude>**/NetworkFailoverTest.*/**</exclude>
+ <!-- This test only works on machines which have ssh properly configured -->
+ <exclude>**/SSHTunnelNetworkReconnectTest.*</exclude>
</excludes>
</configuration>
</plugin>
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerRedeliveryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerRedeliveryTest.java
index 2635c8f..f64db90 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerRedeliveryTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerRedeliveryTest.java
@@ -146,6 +146,7 @@ public class BrokerRedeliveryTest extends org.apache.activemq.TestSupport {
PolicyEntry policyEntry = new PolicyEntry();
policyEntry.setUseCache(false); // disable the cache such that duplicates are not suppressed on send
+ policyEntry.setSendDuplicateFromStoreToDLQ(true);
PolicyMap policyMap = new PolicyMap();
policyMap.setDefaultEntry(policyEntry);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3537Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3537Test.java
index d3d6ebe..8a14865 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3537Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3537Test.java
@@ -51,7 +51,7 @@ import org.junit.Test;
public class AMQ3537Test implements InvocationHandler, Serializable {
static {
- System.setProperty("org.apache.activemq.SERIALIZABLE_PACKAGES", "java.util,org.apache.activemq.bugs");
+ System.setProperty("org.apache.activemq.SERIALIZABLE_PACKAGES", "com.sun.proxy,java.util,org.apache.activemq.bugs");
}
private static final long serialVersionUID = 1L;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4952Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4952Test.java
index 0b99555..fe1001e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4952Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4952Test.java
@@ -418,6 +418,7 @@ public class AMQ4952Test {
policy.setQueue(">");
policy.setEnableAudit(enableCursorAudit);
policy.setExpireMessagesPeriod(0);
+ policy.setSendDuplicateFromStoreToDLQ(true);
// set replay with no consumers
ConditionalNetworkBridgeFilterFactory conditionalNetworkBridgeFilterFactory = new ConditionalNetworkBridgeFilterFactory();
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java
index 37a7090..86672c5 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java
@@ -52,6 +52,7 @@ public class DurableFiveBrokerNetworkBridgeTest extends JmsMultipleBrokersTestSu
NetworkConnector connector = super.bridgeBrokers(localBrokerName, remoteBrokerName);
ArrayList<ActiveMQDestination> includedDestinations = new ArrayList<>();
includedDestinations.add(new ActiveMQTopic("TEST.FOO?forceDurable=true"));
+ connector.setDynamicallyIncludedDestinations(includedDestinations);
connector.setDuplex(duplex);
connector.setDecreaseNetworkConsumerPriority(false);
connector.setConduitSubscriptions(true);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCConcurrentDLQTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCConcurrentDLQTest.java
index 85b502c..139c781 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCConcurrentDLQTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCConcurrentDLQTest.java
@@ -72,7 +72,8 @@ public class JDBCConcurrentDLQTest {
appender = new AbstractAppender("testAppender", new AbstractFilter() {}, new MessageLayout(), false, new Property[0]) {
@Override
public void append(LogEvent event) {
- if (event.getLevel().isMoreSpecificThan(Level.INFO)) {
+ //isMoreSpecificThan is actually greather or equal so poorly named
+ if (event.getLevel().isMoreSpecificThan(Level.WARN)) {
LOG.error("Got error from log:" + event.getMessage().getFormattedMessage());
gotError.set(true);
}
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/OfflineDurableSubscriberTimeoutTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/OfflineDurableSubscriberTimeoutTest.java
index 632471b..49ea5c5 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/OfflineDurableSubscriberTimeoutTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/OfflineDurableSubscriberTimeoutTest.java
@@ -128,7 +128,8 @@ public class OfflineDurableSubscriberTimeoutTest extends org.apache.activemq.Tes
final var appender = new AbstractAppender("testAppender", new AbstractFilter() {}, new MessageLayout(), false, new Property[0]) {
@Override
public void append(LogEvent event) {
- if (event.getLevel().isLessSpecificThan(Level.WARN)) {
+ if (event.getLevel().isMoreSpecificThan(Level.WARN) &&
+ !event.getMessage().getFormattedMessage().contains("Store limit")) {
LOG.info("received unexpected log message: " + event.getMessage());
foundLogMessage.set(true);
}
diff --git a/activemq-unit-tests/src/test/resources/spring-embedded-xbean-local.xml b/activemq-unit-tests/src/test/resources/spring-embedded-xbean-local.xml
index 584faea..cb8f1fb 100644
--- a/activemq-unit-tests/src/test/resources/spring-embedded-xbean-local.xml
+++ b/activemq-unit-tests/src/test/resources/spring-embedded-xbean-local.xml
@@ -44,7 +44,7 @@
<!-- lets wrap in a pool to avoid creating a connection per send -->
<bean class="org.springframework.jms.connection.SingleConnectionFactory">
<property name="targetConnectionFactory">
- <ref local="jmsFactory" />
+ <ref bean="jmsFactory" />
</property>
</bean>
</property>
diff --git a/activemq-unit-tests/src/test/resources/spring-embedded-xbean.xml b/activemq-unit-tests/src/test/resources/spring-embedded-xbean.xml
index e21073c..2498c6a 100644
--- a/activemq-unit-tests/src/test/resources/spring-embedded-xbean.xml
+++ b/activemq-unit-tests/src/test/resources/spring-embedded-xbean.xml
@@ -44,7 +44,7 @@
<!-- lets wrap in a pool to avoid creating a connection per send -->
<bean class="org.springframework.jms.connection.SingleConnectionFactory">
<property name="targetConnectionFactory">
- <ref local="jmsFactory" />
+ <ref bean="jmsFactory" />
</property>
</bean>
</property>
diff --git a/activemq-unit-tests/src/test/resources/spring-embedded.xml b/activemq-unit-tests/src/test/resources/spring-embedded.xml
index 39f0950..4707091 100644
--- a/activemq-unit-tests/src/test/resources/spring-embedded.xml
+++ b/activemq-unit-tests/src/test/resources/spring-embedded.xml
@@ -36,7 +36,7 @@
<!-- lets wrap in a pool to avoid creating a connection per send -->
<bean class="org.springframework.jms.connection.SingleConnectionFactory">
<property name="targetConnectionFactory">
- <ref local="jmsFactory"/>
+ <ref bean="jmsFactory"/>
</property>
</bean>
</property>
diff --git a/activemq-unit-tests/src/test/resources/spring-queue.xml b/activemq-unit-tests/src/test/resources/spring-queue.xml
index 94c31a2..0ad4a0d 100644
--- a/activemq-unit-tests/src/test/resources/spring-queue.xml
+++ b/activemq-unit-tests/src/test/resources/spring-queue.xml
@@ -31,7 +31,7 @@
<!-- lets wrap in a pool to avoid creating a connection per send -->
<bean class="org.springframework.jms.connection.SingleConnectionFactory">
<property name="targetConnectionFactory">
- <ref local="jmsFactory"/>
+ <ref bean="jmsFactory"/>
</property>
</bean>
</property>
diff --git a/activemq-unit-tests/src/test/resources/spring.xml b/activemq-unit-tests/src/test/resources/spring.xml
index 51eb08d..e88dad0 100644
--- a/activemq-unit-tests/src/test/resources/spring.xml
+++ b/activemq-unit-tests/src/test/resources/spring.xml
@@ -31,7 +31,7 @@
<!-- lets wrap in a pool to avoid creating a connection per send -->
<bean class="org.springframework.jms.connection.SingleConnectionFactory">
<property name="targetConnectionFactory">
- <ref local="jmsFactory"/>
+ <ref bean="jmsFactory"/>
</property>
</bean>
</property>