From 85989fb5091c8cf8eacb6fdfc90e529e602d4ec8 Mon Sep 17 00:00:00 2001 From: Howard Gao Date: Mon, 10 Aug 2015 11:08:27 +0800 Subject: [PATCH 1/2] Fix openwire test: ExpiryHogTest Removed code irrelevant to Artemis broker --- .../src/test/java/org/apache/activemq/ExpiryHogTest.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ExpiryHogTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ExpiryHogTest.java index eff6efa802..a07ee1e681 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ExpiryHogTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ExpiryHogTest.java @@ -23,7 +23,6 @@ import javax.jms.TextMessage; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.region.policy.PolicyEntry; import org.apache.activemq.broker.region.policy.PolicyMap; -import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -58,8 +57,6 @@ public class ExpiryHogTest extends JmsMultipleClientsTestSupport { policyMap.setDefaultEntry(defaultEntry); bs.setDestinationPolicy(policyMap); - KahaDBPersistenceAdapter ad = (KahaDBPersistenceAdapter) bs.getPersistenceAdapter(); - ad.setConcurrentStoreAndDispatchQueues(true); return bs; } From 125bfd34e7e81d772edf7810f818f0e52c992ebd Mon Sep 17 00:00:00 2001 From: Howard Gao Date: Mon, 10 Aug 2015 14:50:18 +0800 Subject: [PATCH 2/2] Fix openwire IsStillMarshallsTheSameTest Added missing resource files. --- ...org.apache.activemq.openwire.BrokerInfoData.bin | Bin 0 -> 71 bytes ...apache.activemq.openwire.WireFormatInfoData.bin | Bin 0 -> 42 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 tests/activemq5-unit-tests/src/test/resources/openwire-control/org.apache.activemq.openwire.BrokerInfoData.bin create mode 100644 tests/activemq5-unit-tests/src/test/resources/openwire-control/org.apache.activemq.openwire.WireFormatInfoData.bin diff --git a/tests/activemq5-unit-tests/src/test/resources/openwire-control/org.apache.activemq.openwire.BrokerInfoData.bin b/tests/activemq5-unit-tests/src/test/resources/openwire-control/org.apache.activemq.openwire.BrokerInfoData.bin new file mode 100644 index 0000000000000000000000000000000000000000..958806924fa8734d070b42f0b4f783d36f95f230 GIT binary patch literal 71 zcmZQzU~pz)U|`^3V60(e5b$)dGBmQVGyoFDK*E@jL9`^fz)D{~CqFqcCnLYO#LCPN N2pJd|IN?G-?Et+b4-NnT literal 0 HcmV?d00001 diff --git a/tests/activemq5-unit-tests/src/test/resources/openwire-control/org.apache.activemq.openwire.WireFormatInfoData.bin b/tests/activemq5-unit-tests/src/test/resources/openwire-control/org.apache.activemq.openwire.WireFormatInfoData.bin new file mode 100644 index 0000000000000000000000000000000000000000..101210613cb6ba43b88daf9f48929663ecae8448 GIT binary patch literal 42 tcmZQzU{GUpOfJbROZ5$8U|?Wm1QH@31_O_CVsb{RYhGefPHGAxBLI=m2gU#Z literal 0 HcmV?d00001