You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ro...@apache.org on 2024/05/21 15:47:28 UTC
(activemq-artemis) branch main updated (3c058e98f1 -> f64d918406)
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
from 3c058e98f1 ARTEMIS-3622 MQTT can deadlock on client cxn/discxn
new 98e1389a6e ARTEMIS-4778: clean up configuration test heirarchy, remove hundreds of duplicate tests, isolate parameterized tests
new 3e20687cf3 ARTEMIS-4778: replace various assertEquals checks with more apropriate assertTrue / assertFalse / assertNull
new 243ea9aa01 ARTEMIS-4778: remove spawn check rule, not needed as the tests dont spawn
new 3c84f26413 ARTEMIS-4778: split two Nested test classes (one parameterized, other not) into their own class files
new 7849e2dcbf ARTEMIS-4778: extract base class and classes from parameterized test with subclass that skips to de-parameterize itself
new f64d918406 ARTEMIS-4778: rework tests manipulating Xxe config so it is reset after class, and not updated at all for skipped tests
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../activemq/artemis/utils/XmlProviderTest.java | 41 +-
.../config/impl/AbstractConfigurationTestBase.java | 490 +++++++++++++++++++++
.../core/config/impl/ConfigurationImplTest.java | 473 +-------------------
.../config/impl/DefaultsFileConfigurationTest.java | 24 +-
...ConfigurationBrokerConnectionEncryptedTest.java | 34 +-
.../impl/FileConfigurationDbEncryptedPassTest.java | 37 +-
.../impl/FileConfigurationSecurityPluginTest.java | 37 +-
.../core/config/impl/FileConfigurationTest.java | 102 ++++-
.../config/impl/FileXIncludeConfigurationTest.java | 28 +-
.../impl/FileXIncludeSchemaConfigurationTest.java | 34 +-
.../activemq/ActiveMQXAConnectionFactoryTest.java | 2 +-
.../activemq/command/ActiveMQMessageTest.java | 2 +-
.../amqp/AmqpFlowControlFailDispositionTests.java | 103 +++++
.../amqp/AmqpFlowControlFailOrdinaryTests.java | 94 ++++
.../integration/amqp/AmqpFlowControlFailTest.java | 175 --------
...ibutionTest.java => NettyFailoverInVMTest.java} | 7 +-
...ibutionTest.java => NettyFailoverJdbcTest.java} | 7 +-
...ailoverTest.java => NettyFailoverTestBase.java} | 18 +-
.../failover/NettyReplicatedFailoverTest.java | 2 +-
.../artemis/amqpJMS/JoramAMQPAggregationTest.java | 6 -
.../artemis/jms/JoramCoreAggregationTest.java | 5 -
.../message/properties/JMSXPropertyTest.java | 8 +-
.../properties/MessagePropertyConversionTest.java | 6 +-
.../message/properties/MessagePropertyTest.java | 2 +-
.../jms/conform/session/QueueSessionTest.java | 8 +-
.../jtests/jms/conform/session/SessionTest.java | 20 +-
.../jms/conform/session/TopicSessionTest.java | 4 +-
27 files changed, 982 insertions(+), 787 deletions(-)
create mode 100644 artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/AbstractConfigurationTestBase.java
create mode 100644 tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFlowControlFailDispositionTests.java
create mode 100644 tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFlowControlFailOrdinaryTests.java
delete mode 100644 tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFlowControlFailTest.java
copy tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/{SharedStoreDistributionTest.java => NettyFailoverInVMTest.java} (85%)
copy tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/{SharedStoreDistributionTest.java => NettyFailoverJdbcTest.java} (85%)
rename tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/{NettyFailoverTest.java => NettyFailoverTestBase.java} (93%)
(activemq-artemis) 06/06: ARTEMIS-4778: rework tests manipulating Xxe config so it is reset after class, and not updated at all for skipped tests
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit f64d9184066f33a08bf04d6ce75a7649af17b87e
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Tue May 21 16:18:38 2024 +0100
ARTEMIS-4778: rework tests manipulating Xxe config so it is reset after class, and not updated at all for skipped tests
---
.../activemq/artemis/utils/XmlProviderTest.java | 41 ++++++++++++++-
.../core/config/impl/FileConfigurationTest.java | 61 ++++++++++++++++++----
.../config/impl/FileXIncludeConfigurationTest.java | 18 ++++---
.../impl/FileXIncludeSchemaConfigurationTest.java | 18 ++++---
4 files changed, 115 insertions(+), 23 deletions(-)
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/XmlProviderTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/XmlProviderTest.java
index 989ae50f6e..86ce633949 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/XmlProviderTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/XmlProviderTest.java
@@ -21,30 +21,67 @@ import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Validator;
import java.io.File;
+import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+import org.apache.activemq.artemis.tests.util.ArtemisTestCase;
+import org.junit.AfterClass;
import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@RunWith(Parameterized.class)
-public class XmlProviderTest {
+public class XmlProviderTest extends ArtemisTestCase {
+
+ private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+ private static Boolean origXxeEnabled;
+
+ protected boolean xxeEnabled;
@Parameterized.Parameters(name = "xxeEnabled={0}")
public static Collection getParameters() {
return Arrays.asList(new Boolean[]{true, false});
}
- public XmlProviderTest(boolean xxeEnabled) {
+ @BeforeClass
+ public static void beforeAll() {
+ if (origXxeEnabled == null) {
+ origXxeEnabled = XmlProvider.isXxeEnabled();
+ }
+
+ logger.trace("BeforeAll - origXxeEnabled={}, isXxeEnabled={}", origXxeEnabled, XmlProvider.isXxeEnabled());
+ }
+
+ @AfterClass
+ public static void afterAll() {
+ logger.trace("AfterAll - origXxeEnabled={}, isXxeEnabled={} ", origXxeEnabled, XmlProvider.isXxeEnabled());
+ if (origXxeEnabled != null) {
+ logger.trace("AfterAll - Resetting XxeEnabled={}", origXxeEnabled);
+ XmlProvider.setXxeEnabled(origXxeEnabled);
+ }
+ }
+
+ @Before
+ public void setUp() {
+ logger.trace("Running setUp - xxeEnabled={}", xxeEnabled);
XmlProvider.setXxeEnabled(xxeEnabled);
}
+ public XmlProviderTest(boolean xxeEnabled) {
+ this.xxeEnabled = xxeEnabled;
+ }
+
@Test
public void testDocument() throws Exception {
DocumentBuilder documentBuilder = XmlProvider.newDocumentBuilder();
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
index 214b6e7b65..f9d4958336 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
@@ -24,6 +24,7 @@ import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.util.Arrays;
import java.util.Collection;
+import java.lang.invoke.MethodHandles;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
@@ -76,39 +77,81 @@ import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
import org.apache.activemq.artemis.utils.RandomUtil;
import org.apache.activemq.artemis.utils.XmlProvider;
import org.apache.activemq.artemis.utils.critical.CriticalAnalyzerPolicy;
+import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@RunWith(Parameterized.class)
public class FileConfigurationTest extends AbstractConfigurationTestBase {
+ private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+ private static Boolean origXxeEnabled;
+
+ protected boolean xxeEnabled;
+
+ @Parameterized.Parameters(name = "xxeEnabled={0}")
+ public static Collection getParameters() {
+ return Arrays.asList(new Boolean[] {true, false});
+ }
+
@BeforeClass
- public static void setupProperties() {
+ public static void beforeAll() {
+ if (origXxeEnabled == null) {
+ origXxeEnabled = XmlProvider.isXxeEnabled();
+ }
+
+ logger.trace("BeforeAll - origXxeEnabled={}, isXxeEnabled={}", origXxeEnabled, XmlProvider.isXxeEnabled());
+ }
+
+ @AfterClass
+ public static void afterAll() {
+ logger.trace("AfterAll - origXxeEnabled={}, isXxeEnabled={} ", origXxeEnabled, XmlProvider.isXxeEnabled());
+ if (origXxeEnabled != null) {
+ logger.trace("AfterAll - Resetting XxeEnabled={}", origXxeEnabled);
+ XmlProvider.setXxeEnabled(origXxeEnabled);
+ }
+ }
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ logger.trace("Running setUp - xxeEnabled={}", xxeEnabled);
+ XmlProvider.setXxeEnabled(xxeEnabled);
+
+ setupProperties();
+
+ super.setUp();
+ }
+
+ @After
+ public void afterEach() {
+ clearProperties();
+ }
+
+ public void setupProperties() {
System.setProperty("a2Prop", "a2");
System.setProperty("falseProp", "false");
System.setProperty("trueProp", "true");
System.setProperty("ninetyTwoProp", "92");
}
- @AfterClass
- public static void clearProperties() {
+ public void clearProperties() {
System.clearProperty("a2Prop");
System.clearProperty("falseProp");
System.clearProperty("trueProp");
System.clearProperty("ninetyTwoProp");
}
- @Parameterized.Parameters(name = "xxeEnabled={0}")
- public static Collection getParameters() {
- return Arrays.asList(new Boolean[] {true, false});
- }
-
public FileConfigurationTest(boolean xxeEnabled) {
- XmlProvider.setXxeEnabled(xxeEnabled);
+ this.xxeEnabled = xxeEnabled;
}
protected String getConfigurationName() {
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeConfigurationTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeConfigurationTest.java
index 8422d9fd7d..9004997665 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeConfigurationTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeConfigurationTest.java
@@ -16,9 +16,8 @@
*/
package org.apache.activemq.artemis.core.config.impl;
-import org.junit.AfterClass;
import org.junit.Assume;
-import org.junit.BeforeClass;
+import org.junit.Before;
public class FileXIncludeConfigurationTest extends FileConfigurationTest {
@@ -29,11 +28,18 @@ public class FileXIncludeConfigurationTest extends FileConfigurationTest {
public FileXIncludeConfigurationTest(boolean xxeEnabled) {
super(xxeEnabled);
+ }
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
Assume.assumeTrue(xxeEnabled);
+
+ super.setUp();
}
- @BeforeClass
- public static void setupProperties() {
+ @Override
+ public void setupProperties() {
System.setProperty("xincludePath", "./src/test/resources");
System.setProperty("a2Prop", "a2");
System.setProperty("falseProp", "false");
@@ -41,8 +47,8 @@ public class FileXIncludeConfigurationTest extends FileConfigurationTest {
System.setProperty("ninetyTwoProp", "92");
}
- @AfterClass
- public static void clearProperties() {
+ @Override
+ public void clearProperties() {
System.clearProperty("xincludePath");
System.clearProperty("a2Prop");
System.clearProperty("falseProp");
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeSchemaConfigurationTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeSchemaConfigurationTest.java
index a45e64c73a..329d78d702 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeSchemaConfigurationTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeSchemaConfigurationTest.java
@@ -17,9 +17,8 @@
package org.apache.activemq.artemis.core.config.impl;
import org.apache.activemq.artemis.core.server.plugin.ActiveMQServerBasePlugin;
-import org.junit.AfterClass;
import org.junit.Assume;
-import org.junit.BeforeClass;
+import org.junit.Before;
import org.junit.Test;
public class FileXIncludeSchemaConfigurationTest extends FileConfigurationTest {
@@ -31,11 +30,18 @@ public class FileXIncludeSchemaConfigurationTest extends FileConfigurationTest {
public FileXIncludeSchemaConfigurationTest(boolean xxeEnabled) {
super(xxeEnabled);
+ }
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
Assume.assumeTrue(xxeEnabled);
+
+ super.setUp();
}
- @BeforeClass
- public static void setupProperties() {
+ @Override
+ public void setupProperties() {
System.setProperty("xincludePath", "./src/test/resources");
System.setProperty("a2Prop", "a2");
System.setProperty("falseProp", "false");
@@ -43,8 +49,8 @@ public class FileXIncludeSchemaConfigurationTest extends FileConfigurationTest {
System.setProperty("ninetyTwoProp", "92");
}
- @AfterClass
- public static void clearProperties() {
+ @Override
+ public void clearProperties() {
System.clearProperty("xincludePath");
System.clearProperty("a2Prop");
System.clearProperty("falseProp");
(activemq-artemis) 05/06: ARTEMIS-4778: extract base class and classes from parameterized test with subclass that skips to de-parameterize itself
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 7849e2dcbff19da774f3027b619c56516d8ac628
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Tue May 21 16:18:22 2024 +0100
ARTEMIS-4778: extract base class and classes from parameterized test with subclass that skips to de-parameterize itself
---
.../cluster/failover/NettyFailoverInVMTest.java | 24 ++++++++++++++++++++++
.../cluster/failover/NettyFailoverJdbcTest.java | 24 ++++++++++++++++++++++
...ailoverTest.java => NettyFailoverTestBase.java} | 18 +++++-----------
.../failover/NettyReplicatedFailoverTest.java | 2 +-
4 files changed, 54 insertions(+), 14 deletions(-)
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFailoverInVMTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFailoverInVMTest.java
new file mode 100644
index 0000000000..947048c8e3
--- /dev/null
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFailoverInVMTest.java
@@ -0,0 +1,24 @@
+/*
+ * 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.cluster.failover;
+
+public class NettyFailoverInVMTest extends NettyFailoverTestBase {
+
+ public NettyFailoverInVMTest() {
+ super(NodeManagerType.InVM);
+ }
+}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFailoverJdbcTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFailoverJdbcTest.java
new file mode 100644
index 0000000000..2d2469694c
--- /dev/null
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFailoverJdbcTest.java
@@ -0,0 +1,24 @@
+/*
+ * 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.cluster.failover;
+
+public class NettyFailoverJdbcTest extends NettyFailoverTestBase {
+
+ public NettyFailoverJdbcTest() {
+ super(NodeManagerType.Jdbc);
+ }
+}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFailoverTestBase.java
similarity index 93%
rename from tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFailoverTest.java
rename to tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFailoverTestBase.java
index c07949ed7f..3bef6a4c1a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyFailoverTestBase.java
@@ -17,7 +17,6 @@
package org.apache.activemq.artemis.tests.integration.cluster.failover;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -52,25 +51,18 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-@RunWith(Parameterized.class)
-public class NettyFailoverTest extends FailoverTest {
+public class NettyFailoverTestBase extends FailoverTest {
public enum NodeManagerType {
InVM, Jdbc
}
- @Parameterized.Parameters(name = "{0} Node Manager")
- public static Iterable<? extends Object> nodeManagerTypes() {
- return Arrays.asList(new Object[][]{
- {NodeManagerType.Jdbc},
- {NodeManagerType.InVM}});
- }
+ public final NodeManagerType nodeManagerType;
- @Parameterized.Parameter(0)
- public NodeManagerType nodeManagerType;
+ public NettyFailoverTestBase(NodeManagerType nodeManagerType) {
+ this.nodeManagerType = nodeManagerType;
+ }
@Override
protected TransportConfiguration getAcceptorTransportConfiguration(final boolean primary) {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java
index 65277e97e1..a2770d0107 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java
@@ -40,7 +40,7 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class NettyReplicatedFailoverTest extends NettyFailoverTest {
+public class NettyReplicatedFailoverTest extends NettyFailoverInVMTest {
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
(activemq-artemis) 02/06: ARTEMIS-4778: replace various assertEquals checks with more apropriate assertTrue / assertFalse / assertNull
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 3e20687cf3637a941c9199275ed6be51163dc6a8
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Tue May 21 16:15:51 2024 +0100
ARTEMIS-4778: replace various assertEquals checks with more apropriate assertTrue / assertFalse / assertNull
---
.../activemq/ActiveMQXAConnectionFactoryTest.java | 2 +-
.../apache/activemq/command/ActiveMQMessageTest.java | 2 +-
.../conform/message/properties/JMSXPropertyTest.java | 8 ++++----
.../properties/MessagePropertyConversionTest.java | 6 +++---
.../message/properties/MessagePropertyTest.java | 2 +-
.../jtests/jms/conform/session/QueueSessionTest.java | 8 ++++----
.../jtests/jms/conform/session/SessionTest.java | 20 ++++++++++----------
.../jtests/jms/conform/session/TopicSessionTest.java | 4 ++--
8 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ActiveMQXAConnectionFactoryTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ActiveMQXAConnectionFactoryTest.java
index 892125f744..286dd0d5c9 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ActiveMQXAConnectionFactoryTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ActiveMQXAConnectionFactoryTest.java
@@ -106,7 +106,7 @@ public class ActiveMQXAConnectionFactoryTest extends CombinationTestSupport {
assertEquals(10, cf.getRedeliveryPolicy().getMaximumRedeliveries());
assertEquals(10000, cf.getRedeliveryPolicy().getInitialRedeliveryDelay());
assertEquals(10000, cf.getRedeliveryPolicy().getRedeliveryDelay());
- assertEquals(true, cf.getRedeliveryPolicy().isUseExponentialBackOff());
+ assertTrue(cf.getRedeliveryPolicy().isUseExponentialBackOff());
assertEquals(2.0, cf.getRedeliveryPolicy().getBackOffMultiplier(), 0.1);
// the broker url have been adjusted.
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQMessageTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQMessageTest.java
index 706261adb2..c0cdb15962 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQMessageTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQMessageTest.java
@@ -531,7 +531,7 @@ public class ActiveMQMessageTest extends TestCase {
assertEquals("Cheddar", msg.getStringProperty(name));
msg.setStringProperty(name, null);
- assertEquals(null, msg.getStringProperty(name));
+ assertNull(msg.getStringProperty(name));
}
public void testSetNullPropertyName() throws JMSException {
diff --git a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/properties/JMSXPropertyTest.java b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/properties/JMSXPropertyTest.java
index 188d212022..c04451c618 100644
--- a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/properties/JMSXPropertyTest.java
+++ b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/properties/JMSXPropertyTest.java
@@ -91,7 +91,7 @@ public class JMSXPropertyTest extends PTPTestCase {
// senderSession has been created as non transacted
// we create it again but as a transacted session
senderSession = senderConnection.createQueueSession(true, 0);
- Assert.assertEquals(true, senderSession.getTransacted());
+ Assert.assertTrue(senderSession.getTransacted());
// we create again the sender
sender = senderSession.createSender(senderQueue);
senderConnection.start();
@@ -100,7 +100,7 @@ public class JMSXPropertyTest extends PTPTestCase {
// receiverSession has been created as non transacted
// we create it again but as a transacted session
receiverSession = receiverConnection.createQueueSession(true, 0);
- Assert.assertEquals(true, receiverSession.getTransacted());
+ Assert.assertTrue(receiverSession.getTransacted());
// we create again the receiver
if (receiver != null) {
receiver.close();
@@ -123,7 +123,7 @@ public class JMSXPropertyTest extends PTPTestCase {
// ... which is the one which was sent...
Assert.assertEquals("testJMSXDeliveryCount", msg.getText());
// ...and has not been redelivered
- Assert.assertEquals(false, msg.getJMSRedelivered());
+ Assert.assertFalse(msg.getJMSRedelivered());
// ... so it has been delivered once
int jmsxDeliveryCount = msg.getIntProperty("JMSXDeliveryCount");
Assert.assertEquals(1, jmsxDeliveryCount);
@@ -138,7 +138,7 @@ public class JMSXPropertyTest extends PTPTestCase {
// ... which is still the one which was sent...
Assert.assertEquals("testJMSXDeliveryCount", msg.getText());
// .. but this time, it has been redelivered
- Assert.assertEquals(true, msg.getJMSRedelivered());
+ Assert.assertTrue(msg.getJMSRedelivered());
// ... so it has been delivered a second time
jmsxDeliveryCount = msg.getIntProperty("JMSXDeliveryCount");
Assert.assertEquals(2, jmsxDeliveryCount);
diff --git a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/properties/MessagePropertyConversionTest.java b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/properties/MessagePropertyConversionTest.java
index 414887cce0..d6fcc665b2 100644
--- a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/properties/MessagePropertyConversionTest.java
+++ b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/properties/MessagePropertyConversionTest.java
@@ -293,7 +293,7 @@ public class MessagePropertyConversionTest extends PTPTestCase {
try {
Message message = senderSession.createMessage();
message.setStringProperty("prop", "test");
- Assert.assertEquals(false, message.getBooleanProperty("prop"));
+ Assert.assertFalse(message.getBooleanProperty("prop"));
} catch (MessageFormatException e) {
} catch (JMSException e) {
fail(e);
@@ -310,7 +310,7 @@ public class MessagePropertyConversionTest extends PTPTestCase {
try {
Message message = senderSession.createMessage();
message.setStringProperty("prop", "true");
- Assert.assertEquals(true, message.getBooleanProperty("prop"));
+ Assert.assertTrue(message.getBooleanProperty("prop"));
} catch (JMSException e) {
fail(e);
}
@@ -1240,7 +1240,7 @@ public class MessagePropertyConversionTest extends PTPTestCase {
try {
Message message = senderSession.createMessage();
message.setBooleanProperty("prop", true);
- Assert.assertEquals(true, message.getBooleanProperty("prop"));
+ Assert.assertTrue(message.getBooleanProperty("prop"));
} catch (JMSException e) {
fail(e);
}
diff --git a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/properties/MessagePropertyTest.java b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/properties/MessagePropertyTest.java
index b1510a2c57..a670dd434c 100644
--- a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/properties/MessagePropertyTest.java
+++ b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/properties/MessagePropertyTest.java
@@ -198,7 +198,7 @@ public class MessagePropertyTest extends PTPTestCase {
public void testGetBooleanProperty() {
try {
Message message = senderSession.createMessage();
- Assert.assertEquals(false, message.getBooleanProperty("prop"));
+ Assert.assertFalse(message.getBooleanProperty("prop"));
} catch (JMSException e) {
fail(e);
}
diff --git a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/session/QueueSessionTest.java b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/session/QueueSessionTest.java
index f717d775d8..c419fe0454 100644
--- a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/session/QueueSessionTest.java
+++ b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/session/QueueSessionTest.java
@@ -46,7 +46,7 @@ public class QueueSessionTest extends PTPTestCase {
// senderSession has been created as non transacted
// we create it again but as a transacted session
senderSession = senderConnection.createQueueSession(true, 0);
- Assert.assertEquals(true, senderSession.getTransacted());
+ Assert.assertTrue(senderSession.getTransacted());
// we create again the sender
sender = senderSession.createSender(senderQueue);
senderConnection.start();
@@ -55,7 +55,7 @@ public class QueueSessionTest extends PTPTestCase {
// receiverSession has been created as non transacted
// we create it again but as a transacted session
receiverSession = receiverConnection.createQueueSession(true, 0);
- Assert.assertEquals(true, receiverSession.getTransacted());
+ Assert.assertTrue(receiverSession.getTransacted());
if (receiver != null) {
receiver.close();
@@ -79,7 +79,7 @@ public class QueueSessionTest extends PTPTestCase {
// ... which is the one which was sent...
Assert.assertEquals("testRollbackRececeivedMessage", msg.getText());
// ...and has not been redelivered
- Assert.assertEquals(false, msg.getJMSRedelivered());
+ Assert.assertFalse(msg.getJMSRedelivered());
// we rollback the *consumer* transaction
receiverSession.rollback();
@@ -92,7 +92,7 @@ public class QueueSessionTest extends PTPTestCase {
// ... which is still the one which was sent...
Assert.assertEquals("testRollbackRececeivedMessage", msg.getText());
// .. but this time, it has been redelivered
- Assert.assertEquals(true, msg.getJMSRedelivered());
+ Assert.assertTrue(msg.getJMSRedelivered());
} catch (Exception e) {
fail(e);
diff --git a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/session/SessionTest.java b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/session/SessionTest.java
index 43ca343b79..b988fcc526 100644
--- a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/session/SessionTest.java
+++ b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/session/SessionTest.java
@@ -42,10 +42,10 @@ public class SessionTest extends PTPTestCase {
public void testRecoverTransactedSession() {
try {
// senderSession has been created as non transacted
- Assert.assertEquals(false, senderSession.getTransacted());
+ Assert.assertFalse(senderSession.getTransacted());
// we create it again but as a transacted session
senderSession = senderConnection.createQueueSession(true, 0);
- Assert.assertEquals(true, senderSession.getTransacted());
+ Assert.assertTrue(senderSession.getTransacted());
senderSession.recover();
Assert.fail("Should raise an IllegalStateException, the session is not transacted.\n");
} catch (javax.jms.IllegalStateException e) {
@@ -67,7 +67,7 @@ public class SessionTest extends PTPTestCase {
// re-create senderSession as a transacted session
senderSession = senderConnection.createQueueSession(true, 0);
sender = senderSession.createSender(senderQueue);
- Assert.assertEquals(true, senderSession.getTransacted());
+ Assert.assertTrue(senderSession.getTransacted());
TextMessage message = senderSession.createTextMessage();
message.setText("testRollbackTransactedSession");
@@ -79,7 +79,7 @@ public class SessionTest extends PTPTestCase {
TextMessage m = (TextMessage) receiver.receiveNoWait();
// test that no message has been received
- Assert.assertEquals(null, m);
+ Assert.assertNull(m);
} catch (Exception e) {
fail(e);
}
@@ -96,7 +96,7 @@ public class SessionTest extends PTPTestCase {
// re-create senderSession as a transacted session
senderSession = senderConnection.createQueueSession(true, 0);
sender = senderSession.createSender(senderQueue);
- Assert.assertEquals(true, senderSession.getTransacted());
+ Assert.assertTrue(senderSession.getTransacted());
TextMessage message = senderSession.createTextMessage();
message.setText("testCommitTransactedSession");
@@ -105,7 +105,7 @@ public class SessionTest extends PTPTestCase {
TextMessage m = (TextMessage) receiver.receiveNoWait();
// test that no message has been received (the transaction has not been committed yet)
- Assert.assertEquals(null, m);
+ Assert.assertNull(m);
// commit the transaction -> the sent message should be received
senderSession.commit();
@@ -127,7 +127,7 @@ public class SessionTest extends PTPTestCase {
public void testRollbackNonTransactedSession() {
try {
// senderSession has been created as non transacted in the setUp() method
- Assert.assertEquals(false, senderSession.getTransacted());
+ Assert.assertFalse(senderSession.getTransacted());
senderSession.rollback();
Assert.fail("Should raise an IllegalStateException, the session is not transacted.\n");
} catch (javax.jms.IllegalStateException e) {
@@ -147,7 +147,7 @@ public class SessionTest extends PTPTestCase {
public void testCommitNonTransactedSession() {
try {
// senderSession has been created as non transacted in the setUp() method
- Assert.assertEquals(false, senderSession.getTransacted());
+ Assert.assertFalse(senderSession.getTransacted());
senderSession.commit();
Assert.fail("Should raise an IllegalStateException, the session is not transacted.\n");
} catch (javax.jms.IllegalStateException e) {
@@ -166,10 +166,10 @@ public class SessionTest extends PTPTestCase {
public void testGetTransacted() {
try {
// senderSession has been created as non transacted
- Assert.assertEquals(false, senderSession.getTransacted());
+ Assert.assertFalse(senderSession.getTransacted());
// we re-create senderSession as a transacted session
senderSession = senderConnection.createQueueSession(true, Session.AUTO_ACKNOWLEDGE);
- Assert.assertEquals(true, senderSession.getTransacted());
+ Assert.assertTrue(senderSession.getTransacted());
} catch (Exception e) {
fail(e);
}
diff --git a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/session/TopicSessionTest.java b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/session/TopicSessionTest.java
index 6eab31decb..22801b4512 100644
--- a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/session/TopicSessionTest.java
+++ b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/session/TopicSessionTest.java
@@ -47,7 +47,7 @@ public class TopicSessionTest extends PubSubTestCase {
// publisherSession has been declared has non transacted
// we recreate it as a transacted session
publisherSession = publisherConnection.createTopicSession(true, 0);
- Assert.assertEquals(true, publisherSession.getTransacted());
+ Assert.assertTrue(publisherSession.getTransacted());
// we also recreate the publisher
publisher = publisherSession.createPublisher(publisherTopic);
publisherConnection.start();
@@ -56,7 +56,7 @@ public class TopicSessionTest extends PubSubTestCase {
// subscriberSession has been declared has non transacted
// we recreate it as a transacted session
subscriberSession = subscriberConnection.createTopicSession(true, 0);
- Assert.assertEquals(true, subscriberSession.getTransacted());
+ Assert.assertTrue(subscriberSession.getTransacted());
// we also recreate the subscriber
subscriber = subscriberSession.createSubscriber(subscriberTopic);
subscriberConnection.start();
(activemq-artemis) 03/06: ARTEMIS-4778: remove spawn check rule, not needed as the tests dont spawn
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 243ea9aa01db65b4c9f1bdf1698dcb5569fa7ba6
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Tue May 21 16:16:08 2024 +0100
ARTEMIS-4778: remove spawn check rule, not needed as the tests dont spawn
---
.../apache/activemq/artemis/amqpJMS/JoramAMQPAggregationTest.java | 6 ------
.../org/apache/activemq/artemis/jms/JoramCoreAggregationTest.java | 5 -----
2 files changed, 11 deletions(-)
diff --git a/tests/joram-tests/src/test/java/org/apache/activemq/artemis/amqpJMS/JoramAMQPAggregationTest.java b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/amqpJMS/JoramAMQPAggregationTest.java
index a703e75b59..1c5f6a3c07 100644
--- a/tests/joram-tests/src/test/java/org/apache/activemq/artemis/amqpJMS/JoramAMQPAggregationTest.java
+++ b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/amqpJMS/JoramAMQPAggregationTest.java
@@ -19,11 +19,9 @@ package org.apache.activemq.artemis.amqpJMS;
import java.io.IOException;
import java.util.Properties;
-import org.apache.activemq.artemis.tests.rules.SpawnedVMCheck;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
-import org.junit.Rule;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
@@ -53,10 +51,6 @@ import org.objectweb.jtests.jms.framework.JMSTestCase;
@SuiteClasses({TopicConnectionTest.class, ConnectionTest.class, MessageBodyTest.class, MessageDefaultTest.class, MessageTypeTest.class, MessageHeaderTest.class, JMSXPropertyTest.class, MessagePropertyConversionTest.class, MessagePropertyTest.class, QueueBrowserTest.class, TemporaryQueueTest.class, SelectorSyntaxTest.class, SelectorTest.class, QueueSessionTest.class, SessionTest.class, TopicSessionTest.class, UnifiedSessionTest.class, TemporaryTopicTest.class,})
public class JoramAMQPAggregationTest extends Assert {
-
- @Rule
- public SpawnedVMCheck check = new SpawnedVMCheck();
-
/**
* Should be overridden
*
diff --git a/tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/JoramCoreAggregationTest.java b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/JoramCoreAggregationTest.java
index 9875b493db..7448b9ca04 100644
--- a/tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/JoramCoreAggregationTest.java
+++ b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/jms/JoramCoreAggregationTest.java
@@ -19,11 +19,9 @@ package org.apache.activemq.artemis.jms;
import java.io.IOException;
import java.util.Properties;
-import org.apache.activemq.artemis.tests.rules.SpawnedVMCheck;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
-import org.junit.Rule;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
@@ -53,9 +51,6 @@ import org.objectweb.jtests.jms.framework.JMSTestCase;
@SuiteClasses({TopicConnectionTest.class, ConnectionTest.class, MessageBodyTest.class, MessageDefaultTest.class, MessageTypeTest.class, MessageHeaderTest.class, JMSXPropertyTest.class, MessagePropertyConversionTest.class, MessagePropertyTest.class, QueueBrowserTest.class, TemporaryQueueTest.class, SelectorSyntaxTest.class, SelectorTest.class, QueueSessionTest.class, SessionTest.class, TopicSessionTest.class, UnifiedSessionTest.class, TemporaryTopicTest.class,})
public class JoramCoreAggregationTest extends Assert {
- @Rule
- public SpawnedVMCheck check = new SpawnedVMCheck();
-
/**
* Should be overridden
*
(activemq-artemis) 01/06: ARTEMIS-4778: clean up configuration test heirarchy, remove hundreds of duplicate tests, isolate parameterized tests
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 98e1389a6e9803554186e0b44cb0be58b9cff276
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Tue May 21 16:15:12 2024 +0100
ARTEMIS-4778: clean up configuration test heirarchy, remove hundreds of duplicate tests, isolate parameterized tests
---
.../config/impl/AbstractConfigurationTestBase.java | 490 +++++++++++++++++++++
.../core/config/impl/ConfigurationImplTest.java | 473 +-------------------
.../config/impl/DefaultsFileConfigurationTest.java | 24 +-
...ConfigurationBrokerConnectionEncryptedTest.java | 34 +-
.../impl/FileConfigurationDbEncryptedPassTest.java | 37 +-
.../impl/FileConfigurationSecurityPluginTest.java | 37 +-
.../core/config/impl/FileConfigurationTest.java | 41 +-
.../config/impl/FileXIncludeConfigurationTest.java | 10 +-
.../impl/FileXIncludeSchemaConfigurationTest.java | 16 +-
9 files changed, 632 insertions(+), 530 deletions(-)
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/AbstractConfigurationTestBase.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/AbstractConfigurationTestBase.java
new file mode 100644
index 0000000000..01babe492c
--- /dev/null
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/AbstractConfigurationTestBase.java
@@ -0,0 +1,490 @@
+/*
+ * 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.core.config.impl;
+
+import java.util.Properties;
+
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.ha.PrimaryOnlyPolicyConfiguration;
+import org.apache.activemq.artemis.core.config.routing.ConnectionRouterConfiguration;
+import org.apache.activemq.artemis.core.server.JournalType;
+import org.apache.activemq.artemis.core.server.plugin.impl.LoggingActiveMQServerPlugin;
+import org.apache.activemq.artemis.core.server.routing.KeyType;
+import org.apache.activemq.artemis.core.server.routing.policies.ConsistentHashModuloPolicy;
+import org.apache.activemq.artemis.core.server.routing.policies.ConsistentHashPolicy;
+import org.apache.activemq.artemis.tests.util.ServerTestBase;
+import org.apache.activemq.artemis.utils.RandomUtil;
+import org.junit.Before;
+
+public abstract class AbstractConfigurationTestBase extends ServerTestBase {
+
+ protected Configuration conf;
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+
+ conf = createConfiguration();
+ }
+
+ protected abstract Configuration createConfiguration() throws Exception;
+
+ // Utility method, not itself a test; call it from actual test method
+ public static void doSetGetAttributesTestImpl(Configuration configuration) throws Exception {
+ for (int j = 0; j < 100; j++) {
+ int i = RandomUtil.randomInt();
+ configuration.setScheduledThreadPoolMaxSize(i);
+ assertEquals(i, configuration.getScheduledThreadPoolMaxSize());
+
+ long l = RandomUtil.randomLong();
+ configuration.setSecurityInvalidationInterval(l);
+ assertEquals(l, configuration.getSecurityInvalidationInterval());
+
+ boolean b = RandomUtil.randomBoolean();
+ configuration.setSecurityEnabled(b);
+ assertEquals(b, configuration.isSecurityEnabled());
+
+ String s = RandomUtil.randomString();
+ configuration.setBindingsDirectory(s);
+ assertEquals(s, configuration.getBindingsDirectory());
+
+ b = RandomUtil.randomBoolean();
+ configuration.setCreateBindingsDir(b);
+ assertEquals(b, configuration.isCreateBindingsDir());
+
+ s = RandomUtil.randomString();
+ configuration.setJournalDirectory(s);
+ assertEquals(s, configuration.getJournalDirectory());
+
+ b = RandomUtil.randomBoolean();
+ configuration.setCreateJournalDir(b);
+ assertEquals(b, configuration.isCreateJournalDir());
+
+ i = RandomUtil.randomInt() % 2;
+ JournalType journal = i == 0 ? JournalType.ASYNCIO : JournalType.NIO;
+ configuration.setJournalType(journal);
+ assertEquals(journal, configuration.getJournalType());
+
+ b = RandomUtil.randomBoolean();
+ configuration.setJournalSyncTransactional(b);
+ assertEquals(b, configuration.isJournalSyncTransactional());
+
+ b = RandomUtil.randomBoolean();
+ configuration.setJournalSyncNonTransactional(b);
+ assertEquals(b, configuration.isJournalSyncNonTransactional());
+
+ i = RandomUtil.randomInt();
+ configuration.setJournalFileSize(i);
+ assertEquals(i, configuration.getJournalFileSize());
+
+ i = RandomUtil.randomInt();
+ configuration.setJournalMinFiles(i);
+ assertEquals(i, configuration.getJournalMinFiles());
+
+ i = RandomUtil.randomInt();
+ configuration.setJournalMaxIO_AIO(i);
+ assertEquals(i, configuration.getJournalMaxIO_AIO());
+
+ i = RandomUtil.randomInt();
+ configuration.setJournalMaxIO_NIO(i);
+ assertEquals(i, configuration.getJournalMaxIO_NIO());
+
+ s = RandomUtil.randomString();
+ configuration.setManagementAddress(new SimpleString(s));
+ assertEquals(s, configuration.getManagementAddress().toString());
+
+ l = RandomUtil.randomLong();
+ configuration.setMessageExpiryScanPeriod(l);
+ assertEquals(l, configuration.getMessageExpiryScanPeriod());
+
+ b = RandomUtil.randomBoolean();
+ configuration.setPersistDeliveryCountBeforeDelivery(b);
+ assertEquals(b, configuration.isPersistDeliveryCountBeforeDelivery());
+
+ b = RandomUtil.randomBoolean();
+ configuration.setEnabledAsyncConnectionExecution(b);
+ assertEquals(b, configuration.isAsyncConnectionExecutionEnabled());
+
+ b = RandomUtil.randomBoolean();
+ configuration.setPersistenceEnabled(b);
+ assertEquals(b, configuration.isPersistenceEnabled());
+
+ b = RandomUtil.randomBoolean();
+ configuration.setJMXManagementEnabled(b);
+ assertEquals(b, configuration.isJMXManagementEnabled());
+
+ l = RandomUtil.randomLong();
+ configuration.setFileDeployerScanPeriod(l);
+ assertEquals(l, configuration.getFileDeployerScanPeriod());
+
+ l = RandomUtil.randomLong();
+ configuration.setConnectionTTLOverride(l);
+ assertEquals(l, configuration.getConnectionTTLOverride());
+
+ i = RandomUtil.randomInt();
+ configuration.setThreadPoolMaxSize(i);
+ assertEquals(i, configuration.getThreadPoolMaxSize());
+
+ SimpleString ss = RandomUtil.randomSimpleString();
+ configuration.setManagementNotificationAddress(ss);
+ assertEquals(ss, configuration.getManagementNotificationAddress());
+
+ s = RandomUtil.randomString();
+ configuration.setClusterUser(s);
+ assertEquals(s, configuration.getClusterUser());
+
+ i = RandomUtil.randomInt();
+ configuration.setIDCacheSize(i);
+ assertEquals(i, configuration.getIDCacheSize());
+
+ b = RandomUtil.randomBoolean();
+ configuration.setPersistIDCache(b);
+ assertEquals(b, configuration.isPersistIDCache());
+
+ i = RandomUtil.randomInt();
+ configuration.setJournalCompactMinFiles(i);
+ assertEquals(i, configuration.getJournalCompactMinFiles());
+
+ i = RandomUtil.randomInt();
+ configuration.setJournalCompactPercentage(i);
+ assertEquals(i, configuration.getJournalCompactPercentage());
+
+ l = RandomUtil.randomLong();
+ configuration.setJournalLockAcquisitionTimeout(l);
+ assertEquals(l, configuration.getJournalLockAcquisitionTimeout());
+
+ i = RandomUtil.randomInt();
+ configuration.setJournalBufferSize_AIO(i);
+ assertEquals(i, configuration.getJournalBufferSize_AIO());
+
+ i = RandomUtil.randomInt();
+ configuration.setJournalBufferTimeout_AIO(i);
+ assertEquals(i, configuration.getJournalBufferTimeout_AIO());
+
+ i = RandomUtil.randomInt();
+ configuration.setJournalBufferSize_NIO(i);
+ assertEquals(i, configuration.getJournalBufferSize_NIO());
+
+ i = RandomUtil.randomInt();
+ configuration.setJournalBufferTimeout_NIO(i);
+ assertEquals(i, configuration.getJournalBufferTimeout_NIO());
+
+ b = RandomUtil.randomBoolean();
+ configuration.setLogJournalWriteRate(b);
+ assertEquals(b, configuration.isLogJournalWriteRate());
+
+ l = RandomUtil.randomLong();
+ configuration.setServerDumpInterval(l);
+ assertEquals(l, configuration.getServerDumpInterval());
+
+ s = RandomUtil.randomString();
+ configuration.setPagingDirectory(s);
+ assertEquals(s, configuration.getPagingDirectory());
+
+ s = RandomUtil.randomString();
+ configuration.setLargeMessagesDirectory(s);
+ assertEquals(s, configuration.getLargeMessagesDirectory());
+
+ l = RandomUtil.randomLong();
+ configuration.setTransactionTimeout(l);
+ assertEquals(l, configuration.getTransactionTimeout());
+
+ b = RandomUtil.randomBoolean();
+ configuration.setMessageCounterEnabled(b);
+ assertEquals(b, configuration.isMessageCounterEnabled());
+
+ l = RandomUtil.randomPositiveLong();
+ configuration.setMessageCounterSamplePeriod(l);
+ assertEquals(l, configuration.getMessageCounterSamplePeriod());
+
+ i = RandomUtil.randomInt();
+ configuration.setMessageCounterMaxDayHistory(i);
+ assertEquals(i, configuration.getMessageCounterMaxDayHistory());
+
+ l = RandomUtil.randomLong();
+ configuration.setTransactionTimeoutScanPeriod(l);
+ assertEquals(l, configuration.getTransactionTimeoutScanPeriod());
+
+ s = RandomUtil.randomString();
+ configuration.setClusterPassword(s);
+ assertEquals(s, configuration.getClusterPassword());
+
+ i = RandomUtil.randomInt();
+ configuration.setPageSyncTimeout(i);
+ assertEquals(i, configuration.getPageSyncTimeout());
+ }
+ }
+
+ // Utility method, not itself a test; call it from actual test method
+ public static void doGetSetInterceptorsTestImpl(Configuration configuration) {
+ final String name1 = "uqwyuqywuy";
+ final String name2 = "yugyugyguyg";
+
+ configuration.getIncomingInterceptorClassNames().add(name1);
+ configuration.getIncomingInterceptorClassNames().add(name2);
+
+ assertTrue(configuration.getIncomingInterceptorClassNames().contains(name1));
+ assertTrue(configuration.getIncomingInterceptorClassNames().contains(name2));
+ assertFalse(configuration.getIncomingInterceptorClassNames().contains("iijij"));
+ }
+
+ // Utility method, not itself a test; call it from actual test method
+ public static void doSerializeTestImpl(Configuration configuration) throws Exception {
+ boolean b = RandomUtil.randomBoolean();
+
+ configuration.setHAPolicyConfiguration(new PrimaryOnlyPolicyConfiguration());
+
+ int i = RandomUtil.randomInt();
+ configuration.setScheduledThreadPoolMaxSize(i);
+ assertEquals(i, configuration.getScheduledThreadPoolMaxSize());
+
+ long l = RandomUtil.randomLong();
+ configuration.setSecurityInvalidationInterval(l);
+ assertEquals(l, configuration.getSecurityInvalidationInterval());
+
+ b = RandomUtil.randomBoolean();
+ configuration.setSecurityEnabled(b);
+ assertEquals(b, configuration.isSecurityEnabled());
+
+ String s = RandomUtil.randomString();
+ configuration.setBindingsDirectory(s);
+ assertEquals(s, configuration.getBindingsDirectory());
+
+ b = RandomUtil.randomBoolean();
+ configuration.setCreateBindingsDir(b);
+ assertEquals(b, configuration.isCreateBindingsDir());
+
+ s = RandomUtil.randomString();
+ configuration.setJournalDirectory(s);
+ assertEquals(s, configuration.getJournalDirectory());
+
+ b = RandomUtil.randomBoolean();
+ configuration.setCreateJournalDir(b);
+ assertEquals(b, configuration.isCreateJournalDir());
+
+ i = RandomUtil.randomInt() % 2;
+ JournalType journal = i == 0 ? JournalType.ASYNCIO : JournalType.NIO;
+ configuration.setJournalType(journal);
+ assertEquals(journal, configuration.getJournalType());
+
+ b = RandomUtil.randomBoolean();
+ configuration.setJournalSyncTransactional(b);
+ assertEquals(b, configuration.isJournalSyncTransactional());
+
+ b = RandomUtil.randomBoolean();
+ configuration.setJournalSyncNonTransactional(b);
+ assertEquals(b, configuration.isJournalSyncNonTransactional());
+
+ i = RandomUtil.randomInt();
+ configuration.setJournalFileSize(i);
+ assertEquals(i, configuration.getJournalFileSize());
+
+ i = RandomUtil.randomInt();
+ configuration.setJournalMinFiles(i);
+ assertEquals(i, configuration.getJournalMinFiles());
+
+ i = RandomUtil.randomInt();
+ configuration.setJournalMaxIO_AIO(i);
+ assertEquals(i, configuration.getJournalMaxIO_AIO());
+
+ i = RandomUtil.randomInt();
+ configuration.setJournalMaxIO_NIO(i);
+ assertEquals(i, configuration.getJournalMaxIO_NIO());
+
+ s = RandomUtil.randomString();
+ configuration.setManagementAddress(new SimpleString(s));
+ assertEquals(s, configuration.getManagementAddress().toString());
+
+ l = RandomUtil.randomLong();
+ configuration.setMessageExpiryScanPeriod(l);
+ assertEquals(l, configuration.getMessageExpiryScanPeriod());
+
+ b = RandomUtil.randomBoolean();
+ configuration.setPersistDeliveryCountBeforeDelivery(b);
+ assertEquals(b, configuration.isPersistDeliveryCountBeforeDelivery());
+
+ b = RandomUtil.randomBoolean();
+ configuration.setEnabledAsyncConnectionExecution(b);
+ assertEquals(b, configuration.isAsyncConnectionExecutionEnabled());
+
+ b = RandomUtil.randomBoolean();
+ configuration.setPersistenceEnabled(b);
+ assertEquals(b, configuration.isPersistenceEnabled());
+
+ b = RandomUtil.randomBoolean();
+ configuration.setJMXManagementEnabled(b);
+ assertEquals(b, configuration.isJMXManagementEnabled());
+
+ l = RandomUtil.randomLong();
+ configuration.setFileDeployerScanPeriod(l);
+ assertEquals(l, configuration.getFileDeployerScanPeriod());
+
+ l = RandomUtil.randomLong();
+ configuration.setConnectionTTLOverride(l);
+ assertEquals(l, configuration.getConnectionTTLOverride());
+
+ i = RandomUtil.randomInt();
+ configuration.setThreadPoolMaxSize(i);
+ assertEquals(i, configuration.getThreadPoolMaxSize());
+
+ SimpleString ss = RandomUtil.randomSimpleString();
+ configuration.setManagementNotificationAddress(ss);
+ assertEquals(ss, configuration.getManagementNotificationAddress());
+
+ s = RandomUtil.randomString();
+ configuration.setClusterUser(s);
+ assertEquals(s, configuration.getClusterUser());
+
+ i = RandomUtil.randomInt();
+ configuration.setIDCacheSize(i);
+ assertEquals(i, configuration.getIDCacheSize());
+
+ b = RandomUtil.randomBoolean();
+ configuration.setPersistIDCache(b);
+ assertEquals(b, configuration.isPersistIDCache());
+
+ i = RandomUtil.randomInt();
+ configuration.setJournalCompactMinFiles(i);
+ assertEquals(i, configuration.getJournalCompactMinFiles());
+
+ i = RandomUtil.randomInt();
+ configuration.setJournalCompactPercentage(i);
+ assertEquals(i, configuration.getJournalCompactPercentage());
+
+ i = RandomUtil.randomInt();
+ configuration.setJournalBufferSize_AIO(i);
+ assertEquals(i, configuration.getJournalBufferSize_AIO());
+
+ i = RandomUtil.randomInt();
+ configuration.setJournalBufferTimeout_AIO(i);
+ assertEquals(i, configuration.getJournalBufferTimeout_AIO());
+
+ i = RandomUtil.randomInt();
+ configuration.setJournalBufferSize_NIO(i);
+ assertEquals(i, configuration.getJournalBufferSize_NIO());
+
+ i = RandomUtil.randomInt();
+ configuration.setJournalBufferTimeout_NIO(i);
+ assertEquals(i, configuration.getJournalBufferTimeout_NIO());
+
+ b = RandomUtil.randomBoolean();
+ configuration.setLogJournalWriteRate(b);
+ assertEquals(b, configuration.isLogJournalWriteRate());
+
+ l = RandomUtil.randomLong();
+ configuration.setServerDumpInterval(l);
+ assertEquals(l, configuration.getServerDumpInterval());
+
+ s = RandomUtil.randomString();
+ configuration.setPagingDirectory(s);
+ assertEquals(s, configuration.getPagingDirectory());
+
+ s = RandomUtil.randomString();
+ configuration.setLargeMessagesDirectory(s);
+ assertEquals(s, configuration.getLargeMessagesDirectory());
+
+ b = RandomUtil.randomBoolean();
+ configuration.setWildcardRoutingEnabled(b);
+ assertEquals(b, configuration.isWildcardRoutingEnabled());
+
+ l = RandomUtil.randomLong();
+ configuration.setTransactionTimeout(l);
+ assertEquals(l, configuration.getTransactionTimeout());
+
+ b = RandomUtil.randomBoolean();
+ configuration.setMessageCounterEnabled(b);
+ assertEquals(b, configuration.isMessageCounterEnabled());
+
+ l = RandomUtil.randomPositiveLong();
+ configuration.setMessageCounterSamplePeriod(l);
+ assertEquals(l, configuration.getMessageCounterSamplePeriod());
+
+ i = RandomUtil.randomInt();
+ configuration.setMessageCounterMaxDayHistory(i);
+ assertEquals(i, configuration.getMessageCounterMaxDayHistory());
+
+ l = RandomUtil.randomLong();
+ configuration.setTransactionTimeoutScanPeriod(l);
+ assertEquals(l, configuration.getTransactionTimeoutScanPeriod());
+
+ s = RandomUtil.randomString();
+ configuration.setClusterPassword(s);
+ assertEquals(s, configuration.getClusterPassword());
+
+ i = RandomUtil.randomInt();
+ configuration.setPageSyncTimeout(i);
+ assertEquals(i, configuration.getPageSyncTimeout());
+
+ configuration.registerBrokerPlugin(new LoggingActiveMQServerPlugin());
+ assertEquals("ensure one plugin registered", 1, configuration.getBrokerPlugins().size());
+ assertEquals("ensure one connection plugin registered", 1, configuration.getBrokerConnectionPlugins().size());
+
+
+ // This will use serialization to perform a deep copy of the object
+ Configuration conf2 = configuration.copy();
+
+ assertTrue(configuration.equals(conf2));
+ }
+
+ // Utility method, not itself a test; call it from actual test method
+ public static void doSetConnectionRoutersPolicyConfigurationTestImpl(ConfigurationImpl configuration) throws Throwable {
+ Properties insertionOrderedProperties = new ConfigurationImpl.InsertionOrderedProperties();
+ insertionOrderedProperties.put("connectionRouters.autoShard.localTargetFilter", "NULL|$STATEFUL_SET_ORDINAL");
+ insertionOrderedProperties.put("connectionRouters.autoShard.keyType", KeyType.CLIENT_ID);
+ insertionOrderedProperties.put("connectionRouters.autoShard.policyConfiguration", ConsistentHashModuloPolicy.NAME);
+ insertionOrderedProperties.put("connectionRouters.autoShard.policyConfiguration.properties." + ConsistentHashModuloPolicy.MODULO, 2);
+
+ insertionOrderedProperties.put("connectionRouters.symmetricRedirect.keyType", KeyType.CLIENT_ID);
+ insertionOrderedProperties.put("connectionRouters.symmetricRedirect.keyFilter", "^.{3}");
+ insertionOrderedProperties.put("connectionRouters.symmetricRedirect.policyConfiguration", ConsistentHashPolicy.NAME);
+ insertionOrderedProperties.put("connectionRouters.symmetricRedirect.poolConfiguration.username", "guest-username");
+ insertionOrderedProperties.put("connectionRouters.symmetricRedirect.poolConfiguration.password", "guest-password");
+ insertionOrderedProperties.put("connectionRouters.symmetricRedirect.poolConfiguration.quorumSize", "2");
+ insertionOrderedProperties.put("connectionRouters.symmetricRedirect.poolConfiguration.localTargetEnabled", Boolean.TRUE.toString());
+ insertionOrderedProperties.put("connectionRouters.symmetricRedirect.poolConfiguration.discoveryGroupName", "discovery-group-1");
+ insertionOrderedProperties.put("connectionRouters.symmetricRedirect.cacheConfiguration.persisted", Boolean.TRUE.toString());
+ insertionOrderedProperties.put("connectionRouters.symmetricRedirect.cacheConfiguration.timeout", "1234");
+
+ configuration.parsePrefixedProperties(insertionOrderedProperties, null);
+
+ assertEquals(2, configuration.getConnectionRouters().size());
+
+ ConnectionRouterConfiguration autoShardConfig = configuration.getConnectionRouters().stream().filter(
+ connectionRouterConfig -> "autoShard".equals(connectionRouterConfig.getName())).findFirst().get();
+ assertEquals(KeyType.CLIENT_ID, autoShardConfig.getKeyType());
+ assertEquals("2", autoShardConfig.getPolicyConfiguration().getProperties().get(ConsistentHashModuloPolicy.MODULO));
+ assertNull(autoShardConfig.getCacheConfiguration());
+ assertNull(autoShardConfig.getPoolConfiguration());
+
+ ConnectionRouterConfiguration symmetricRedirectConfig = configuration.getConnectionRouters().stream().filter(
+ connectionRouterConfig -> "symmetricRedirect".equals(connectionRouterConfig.getName())).findFirst().get();
+ assertEquals(KeyType.CLIENT_ID, symmetricRedirectConfig.getKeyType());
+ assertEquals("^.{3}", symmetricRedirectConfig.getKeyFilter());
+ assertEquals(ConsistentHashPolicy.NAME, symmetricRedirectConfig.getPolicyConfiguration().getName());
+ assertNotNull(symmetricRedirectConfig.getPoolConfiguration());
+ assertEquals("guest-username", symmetricRedirectConfig.getPoolConfiguration().getUsername());
+ assertEquals("guest-password", symmetricRedirectConfig.getPoolConfiguration().getPassword());
+ assertEquals(2, symmetricRedirectConfig.getPoolConfiguration().getQuorumSize());
+ assertEquals(Boolean.TRUE, symmetricRedirectConfig.getPoolConfiguration().isLocalTargetEnabled());
+ assertEquals("discovery-group-1", symmetricRedirectConfig.getPoolConfiguration().getDiscoveryGroupName());
+ assertNotNull(symmetricRedirectConfig.getCacheConfiguration());
+ assertEquals(Boolean.TRUE, symmetricRedirectConfig.getCacheConfiguration().isPersisted());
+ assertEquals(1234, symmetricRedirectConfig.getCacheConfiguration().getTimeout());
+ }
+}
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java
index 8280afacae..b061c71d62 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java
@@ -58,14 +58,12 @@ import org.apache.activemq.artemis.core.config.federation.FederationPolicySet;
import org.apache.activemq.artemis.core.config.federation.FederationQueuePolicyConfiguration;
import org.apache.activemq.artemis.core.config.ha.ColocatedPolicyConfiguration;
import org.apache.activemq.artemis.core.config.ha.LiveOnlyPolicyConfiguration;
-import org.apache.activemq.artemis.core.config.ha.PrimaryOnlyPolicyConfiguration;
import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration;
import org.apache.activemq.artemis.core.config.ha.ReplicatedPolicyConfiguration;
import org.apache.activemq.artemis.core.config.ha.ReplicationBackupPolicyConfiguration;
import org.apache.activemq.artemis.core.config.ha.ReplicationPrimaryPolicyConfiguration;
import org.apache.activemq.artemis.core.config.ha.SharedStoreBackupPolicyConfiguration;
import org.apache.activemq.artemis.core.config.ha.SharedStorePrimaryPolicyConfiguration;
-import org.apache.activemq.artemis.core.config.routing.ConnectionRouterConfiguration;
import org.apache.activemq.artemis.core.config.storage.DatabaseStorageConfiguration;
import org.apache.activemq.artemis.core.deployers.impl.FileConfigurationParser;
import org.apache.activemq.artemis.core.io.SequentialFileFactory;
@@ -76,20 +74,16 @@ import org.apache.activemq.artemis.core.paging.impl.PagingStoreImpl;
import org.apache.activemq.artemis.core.persistence.StorageManager;
import org.apache.activemq.artemis.core.security.Role;
import org.apache.activemq.artemis.core.server.ComponentConfigurationRoutingType;
-import org.apache.activemq.artemis.core.server.JournalType;
import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancingType;
import org.apache.activemq.artemis.core.server.impl.LegacyLDAPSecuritySettingPlugin;
import org.apache.activemq.artemis.core.server.plugin.impl.ConnectionPeriodicExpiryPlugin;
import org.apache.activemq.artemis.core.server.plugin.impl.LoggingActiveMQServerPlugin;
import org.apache.activemq.artemis.core.server.routing.KeyType;
-import org.apache.activemq.artemis.core.server.routing.policies.ConsistentHashModuloPolicy;
-import org.apache.activemq.artemis.core.server.routing.policies.ConsistentHashPolicy;
import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
import org.apache.activemq.artemis.core.settings.impl.DeletionPolicy;
import org.apache.activemq.artemis.core.settings.impl.ResourceLimitSettings;
import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
import org.apache.activemq.artemis.core.settings.impl.SlowConsumerThresholdMeasurementUnit;
-import org.apache.activemq.artemis.tests.util.ServerTestBase;
import org.apache.activemq.artemis.utils.RandomUtil;
import org.apache.activemq.artemis.utils.critical.CriticalAnalyzerPolicy;
import org.apache.commons.lang3.ClassUtils;
@@ -99,14 +93,16 @@ import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;
import org.junit.Assert;
-import org.junit.Before;
import org.junit.Test;
-public class ConfigurationImplTest extends ServerTestBase {
+public class ConfigurationImplTest extends AbstractConfigurationTestBase {
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- protected Configuration conf;
+ @Override
+ protected Configuration createConfiguration() throws Exception {
+ return new ConfigurationImpl();
+ }
@Test
public void testDefaults() {
@@ -173,399 +169,22 @@ public class ConfigurationImplTest extends ServerTestBase {
@Test
public void testSetGetAttributes() throws Exception {
- for (int j = 0; j < 100; j++) {
- int i = RandomUtil.randomInt();
- conf.setScheduledThreadPoolMaxSize(i);
- Assert.assertEquals(i, conf.getScheduledThreadPoolMaxSize());
-
- long l = RandomUtil.randomLong();
- conf.setSecurityInvalidationInterval(l);
- Assert.assertEquals(l, conf.getSecurityInvalidationInterval());
-
- boolean b = RandomUtil.randomBoolean();
- conf.setSecurityEnabled(b);
- Assert.assertEquals(b, conf.isSecurityEnabled());
-
- String s = RandomUtil.randomString();
- conf.setBindingsDirectory(s);
- Assert.assertEquals(s, conf.getBindingsDirectory());
-
- b = RandomUtil.randomBoolean();
- conf.setCreateBindingsDir(b);
- Assert.assertEquals(b, conf.isCreateBindingsDir());
-
- s = RandomUtil.randomString();
- conf.setJournalDirectory(s);
- Assert.assertEquals(s, conf.getJournalDirectory());
-
- b = RandomUtil.randomBoolean();
- conf.setCreateJournalDir(b);
- Assert.assertEquals(b, conf.isCreateJournalDir());
-
- i = RandomUtil.randomInt() % 2;
- JournalType journal = i == 0 ? JournalType.ASYNCIO : JournalType.NIO;
- conf.setJournalType(journal);
- Assert.assertEquals(journal, conf.getJournalType());
-
- b = RandomUtil.randomBoolean();
- conf.setJournalSyncTransactional(b);
- Assert.assertEquals(b, conf.isJournalSyncTransactional());
-
- b = RandomUtil.randomBoolean();
- conf.setJournalSyncNonTransactional(b);
- Assert.assertEquals(b, conf.isJournalSyncNonTransactional());
-
- i = RandomUtil.randomInt();
- conf.setJournalFileSize(i);
- Assert.assertEquals(i, conf.getJournalFileSize());
-
- i = RandomUtil.randomInt();
- conf.setJournalMinFiles(i);
- Assert.assertEquals(i, conf.getJournalMinFiles());
-
- i = RandomUtil.randomInt();
- conf.setJournalMaxIO_AIO(i);
- Assert.assertEquals(i, conf.getJournalMaxIO_AIO());
-
- i = RandomUtil.randomInt();
- conf.setJournalMaxIO_NIO(i);
- Assert.assertEquals(i, conf.getJournalMaxIO_NIO());
-
- s = RandomUtil.randomString();
- conf.setManagementAddress(new SimpleString(s));
- Assert.assertEquals(s, conf.getManagementAddress().toString());
-
- l = RandomUtil.randomLong();
- conf.setMessageExpiryScanPeriod(l);
- Assert.assertEquals(l, conf.getMessageExpiryScanPeriod());
-
- b = RandomUtil.randomBoolean();
- conf.setPersistDeliveryCountBeforeDelivery(b);
- Assert.assertEquals(b, conf.isPersistDeliveryCountBeforeDelivery());
-
- b = RandomUtil.randomBoolean();
- conf.setEnabledAsyncConnectionExecution(b);
- Assert.assertEquals(b, conf.isAsyncConnectionExecutionEnabled());
-
- b = RandomUtil.randomBoolean();
- conf.setPersistenceEnabled(b);
- Assert.assertEquals(b, conf.isPersistenceEnabled());
-
- b = RandomUtil.randomBoolean();
- conf.setJMXManagementEnabled(b);
- Assert.assertEquals(b, conf.isJMXManagementEnabled());
-
- l = RandomUtil.randomLong();
- conf.setFileDeployerScanPeriod(l);
- Assert.assertEquals(l, conf.getFileDeployerScanPeriod());
-
- l = RandomUtil.randomLong();
- conf.setConnectionTTLOverride(l);
- Assert.assertEquals(l, conf.getConnectionTTLOverride());
-
- i = RandomUtil.randomInt();
- conf.setThreadPoolMaxSize(i);
- Assert.assertEquals(i, conf.getThreadPoolMaxSize());
-
- SimpleString ss = RandomUtil.randomSimpleString();
- conf.setManagementNotificationAddress(ss);
- Assert.assertEquals(ss, conf.getManagementNotificationAddress());
-
- s = RandomUtil.randomString();
- conf.setClusterUser(s);
- Assert.assertEquals(s, conf.getClusterUser());
-
- i = RandomUtil.randomInt();
- conf.setIDCacheSize(i);
- Assert.assertEquals(i, conf.getIDCacheSize());
-
- b = RandomUtil.randomBoolean();
- conf.setPersistIDCache(b);
- Assert.assertEquals(b, conf.isPersistIDCache());
-
- i = RandomUtil.randomInt();
- conf.setJournalCompactMinFiles(i);
- Assert.assertEquals(i, conf.getJournalCompactMinFiles());
-
- i = RandomUtil.randomInt();
- conf.setJournalCompactPercentage(i);
- Assert.assertEquals(i, conf.getJournalCompactPercentage());
-
- l = RandomUtil.randomLong();
- conf.setJournalLockAcquisitionTimeout(l);
- Assert.assertEquals(l, conf.getJournalLockAcquisitionTimeout());
-
- i = RandomUtil.randomInt();
- conf.setJournalBufferSize_AIO(i);
- Assert.assertEquals(i, conf.getJournalBufferSize_AIO());
-
- i = RandomUtil.randomInt();
- conf.setJournalBufferTimeout_AIO(i);
- Assert.assertEquals(i, conf.getJournalBufferTimeout_AIO());
-
- i = RandomUtil.randomInt();
- conf.setJournalBufferSize_NIO(i);
- Assert.assertEquals(i, conf.getJournalBufferSize_NIO());
-
- i = RandomUtil.randomInt();
- conf.setJournalBufferTimeout_NIO(i);
- Assert.assertEquals(i, conf.getJournalBufferTimeout_NIO());
-
- b = RandomUtil.randomBoolean();
- conf.setLogJournalWriteRate(b);
- Assert.assertEquals(b, conf.isLogJournalWriteRate());
-
- l = RandomUtil.randomLong();
- conf.setServerDumpInterval(l);
- Assert.assertEquals(l, conf.getServerDumpInterval());
-
- s = RandomUtil.randomString();
- conf.setPagingDirectory(s);
- Assert.assertEquals(s, conf.getPagingDirectory());
-
- s = RandomUtil.randomString();
- conf.setLargeMessagesDirectory(s);
- Assert.assertEquals(s, conf.getLargeMessagesDirectory());
-
- l = RandomUtil.randomLong();
- conf.setTransactionTimeout(l);
- Assert.assertEquals(l, conf.getTransactionTimeout());
-
- b = RandomUtil.randomBoolean();
- conf.setMessageCounterEnabled(b);
- Assert.assertEquals(b, conf.isMessageCounterEnabled());
-
- l = RandomUtil.randomPositiveLong();
- conf.setMessageCounterSamplePeriod(l);
- Assert.assertEquals(l, conf.getMessageCounterSamplePeriod());
-
- i = RandomUtil.randomInt();
- conf.setMessageCounterMaxDayHistory(i);
- Assert.assertEquals(i, conf.getMessageCounterMaxDayHistory());
-
- l = RandomUtil.randomLong();
- conf.setTransactionTimeoutScanPeriod(l);
- Assert.assertEquals(l, conf.getTransactionTimeoutScanPeriod());
-
- s = RandomUtil.randomString();
- conf.setClusterPassword(s);
- Assert.assertEquals(s, conf.getClusterPassword());
-
- i = RandomUtil.randomInt();
- conf.setPageSyncTimeout(i);
- Assert.assertEquals(i, conf.getPageSyncTimeout());
- }
+ doSetGetAttributesTestImpl(conf);
}
@Test
public void testGetSetInterceptors() {
- final String name1 = "uqwyuqywuy";
- final String name2 = "yugyugyguyg";
-
- conf.getIncomingInterceptorClassNames().add(name1);
- conf.getIncomingInterceptorClassNames().add(name2);
-
- Assert.assertTrue(conf.getIncomingInterceptorClassNames().contains(name1));
- Assert.assertTrue(conf.getIncomingInterceptorClassNames().contains(name2));
- Assert.assertFalse(conf.getIncomingInterceptorClassNames().contains("iijij"));
+ doGetSetInterceptorsTestImpl(conf);
}
@Test
public void testSerialize() throws Exception {
- boolean b = RandomUtil.randomBoolean();
-
- conf.setHAPolicyConfiguration(new PrimaryOnlyPolicyConfiguration());
-
- int i = RandomUtil.randomInt();
- conf.setScheduledThreadPoolMaxSize(i);
- Assert.assertEquals(i, conf.getScheduledThreadPoolMaxSize());
-
- long l = RandomUtil.randomLong();
- conf.setSecurityInvalidationInterval(l);
- Assert.assertEquals(l, conf.getSecurityInvalidationInterval());
-
- b = RandomUtil.randomBoolean();
- conf.setSecurityEnabled(b);
- Assert.assertEquals(b, conf.isSecurityEnabled());
-
- String s = RandomUtil.randomString();
- conf.setBindingsDirectory(s);
- Assert.assertEquals(s, conf.getBindingsDirectory());
-
- b = RandomUtil.randomBoolean();
- conf.setCreateBindingsDir(b);
- Assert.assertEquals(b, conf.isCreateBindingsDir());
-
- s = RandomUtil.randomString();
- conf.setJournalDirectory(s);
- Assert.assertEquals(s, conf.getJournalDirectory());
-
- b = RandomUtil.randomBoolean();
- conf.setCreateJournalDir(b);
- Assert.assertEquals(b, conf.isCreateJournalDir());
-
- i = RandomUtil.randomInt() % 2;
- JournalType journal = i == 0 ? JournalType.ASYNCIO : JournalType.NIO;
- conf.setJournalType(journal);
- Assert.assertEquals(journal, conf.getJournalType());
-
- b = RandomUtil.randomBoolean();
- conf.setJournalSyncTransactional(b);
- Assert.assertEquals(b, conf.isJournalSyncTransactional());
-
- b = RandomUtil.randomBoolean();
- conf.setJournalSyncNonTransactional(b);
- Assert.assertEquals(b, conf.isJournalSyncNonTransactional());
-
- i = RandomUtil.randomInt();
- conf.setJournalFileSize(i);
- Assert.assertEquals(i, conf.getJournalFileSize());
-
- i = RandomUtil.randomInt();
- conf.setJournalMinFiles(i);
- Assert.assertEquals(i, conf.getJournalMinFiles());
-
- i = RandomUtil.randomInt();
- conf.setJournalMaxIO_AIO(i);
- Assert.assertEquals(i, conf.getJournalMaxIO_AIO());
-
- i = RandomUtil.randomInt();
- conf.setJournalMaxIO_NIO(i);
- Assert.assertEquals(i, conf.getJournalMaxIO_NIO());
-
- s = RandomUtil.randomString();
- conf.setManagementAddress(new SimpleString(s));
- Assert.assertEquals(s, conf.getManagementAddress().toString());
-
- l = RandomUtil.randomLong();
- conf.setMessageExpiryScanPeriod(l);
- Assert.assertEquals(l, conf.getMessageExpiryScanPeriod());
-
- b = RandomUtil.randomBoolean();
- conf.setPersistDeliveryCountBeforeDelivery(b);
- Assert.assertEquals(b, conf.isPersistDeliveryCountBeforeDelivery());
-
- b = RandomUtil.randomBoolean();
- conf.setEnabledAsyncConnectionExecution(b);
- Assert.assertEquals(b, conf.isAsyncConnectionExecutionEnabled());
-
- b = RandomUtil.randomBoolean();
- conf.setPersistenceEnabled(b);
- Assert.assertEquals(b, conf.isPersistenceEnabled());
-
- b = RandomUtil.randomBoolean();
- conf.setJMXManagementEnabled(b);
- Assert.assertEquals(b, conf.isJMXManagementEnabled());
-
- l = RandomUtil.randomLong();
- conf.setFileDeployerScanPeriod(l);
- Assert.assertEquals(l, conf.getFileDeployerScanPeriod());
-
- l = RandomUtil.randomLong();
- conf.setConnectionTTLOverride(l);
- Assert.assertEquals(l, conf.getConnectionTTLOverride());
-
- i = RandomUtil.randomInt();
- conf.setThreadPoolMaxSize(i);
- Assert.assertEquals(i, conf.getThreadPoolMaxSize());
-
- SimpleString ss = RandomUtil.randomSimpleString();
- conf.setManagementNotificationAddress(ss);
- Assert.assertEquals(ss, conf.getManagementNotificationAddress());
-
- s = RandomUtil.randomString();
- conf.setClusterUser(s);
- Assert.assertEquals(s, conf.getClusterUser());
-
- i = RandomUtil.randomInt();
- conf.setIDCacheSize(i);
- Assert.assertEquals(i, conf.getIDCacheSize());
-
- b = RandomUtil.randomBoolean();
- conf.setPersistIDCache(b);
- Assert.assertEquals(b, conf.isPersistIDCache());
-
- i = RandomUtil.randomInt();
- conf.setJournalCompactMinFiles(i);
- Assert.assertEquals(i, conf.getJournalCompactMinFiles());
-
- i = RandomUtil.randomInt();
- conf.setJournalCompactPercentage(i);
- Assert.assertEquals(i, conf.getJournalCompactPercentage());
-
- i = RandomUtil.randomInt();
- conf.setJournalBufferSize_AIO(i);
- Assert.assertEquals(i, conf.getJournalBufferSize_AIO());
-
- i = RandomUtil.randomInt();
- conf.setJournalBufferTimeout_AIO(i);
- Assert.assertEquals(i, conf.getJournalBufferTimeout_AIO());
-
- i = RandomUtil.randomInt();
- conf.setJournalBufferSize_NIO(i);
- Assert.assertEquals(i, conf.getJournalBufferSize_NIO());
-
- i = RandomUtil.randomInt();
- conf.setJournalBufferTimeout_NIO(i);
- Assert.assertEquals(i, conf.getJournalBufferTimeout_NIO());
-
- b = RandomUtil.randomBoolean();
- conf.setLogJournalWriteRate(b);
- Assert.assertEquals(b, conf.isLogJournalWriteRate());
-
- l = RandomUtil.randomLong();
- conf.setServerDumpInterval(l);
- Assert.assertEquals(l, conf.getServerDumpInterval());
-
- s = RandomUtil.randomString();
- conf.setPagingDirectory(s);
- Assert.assertEquals(s, conf.getPagingDirectory());
-
- s = RandomUtil.randomString();
- conf.setLargeMessagesDirectory(s);
- Assert.assertEquals(s, conf.getLargeMessagesDirectory());
-
- b = RandomUtil.randomBoolean();
- conf.setWildcardRoutingEnabled(b);
- Assert.assertEquals(b, conf.isWildcardRoutingEnabled());
-
- l = RandomUtil.randomLong();
- conf.setTransactionTimeout(l);
- Assert.assertEquals(l, conf.getTransactionTimeout());
-
- b = RandomUtil.randomBoolean();
- conf.setMessageCounterEnabled(b);
- Assert.assertEquals(b, conf.isMessageCounterEnabled());
-
- l = RandomUtil.randomPositiveLong();
- conf.setMessageCounterSamplePeriod(l);
- Assert.assertEquals(l, conf.getMessageCounterSamplePeriod());
-
- i = RandomUtil.randomInt();
- conf.setMessageCounterMaxDayHistory(i);
- Assert.assertEquals(i, conf.getMessageCounterMaxDayHistory());
-
- l = RandomUtil.randomLong();
- conf.setTransactionTimeoutScanPeriod(l);
- Assert.assertEquals(l, conf.getTransactionTimeoutScanPeriod());
-
- s = RandomUtil.randomString();
- conf.setClusterPassword(s);
- Assert.assertEquals(s, conf.getClusterPassword());
-
- i = RandomUtil.randomInt();
- conf.setPageSyncTimeout(i);
- Assert.assertEquals(i, conf.getPageSyncTimeout());
-
- conf.registerBrokerPlugin(new LoggingActiveMQServerPlugin());
- Assert.assertEquals("ensure one plugin registered", 1, conf.getBrokerPlugins().size());
- Assert.assertEquals("ensure one connection plugin registered", 1, conf.getBrokerConnectionPlugins().size());
-
-
- // This will use serialization to perform a deep copy of the object
- Configuration conf2 = conf.copy();
+ doSerializeTestImpl(conf);
+ }
- Assert.assertTrue(conf.equals(conf2));
+ @Test
+ public void testSetConnectionRoutersPolicyConfiguration() throws Throwable {
+ doSetConnectionRoutersPolicyConfigurationTestImpl(new ConfigurationImpl());
}
@Test
@@ -718,61 +337,6 @@ public class ConfigurationImplTest extends ServerTestBase {
Assert.assertEquals(4321, configuration.getGlobalMaxSize());
}
- @Test
- public void testSetConnectionRoutersPolicyConfiguration() throws Throwable {
- testSetConnectionRoutersPolicyConfiguration(new ConfigurationImpl());
- }
-
- @Test
- public void testSetConnectionRoutersPolicyFileConfiguration() throws Throwable {
- testSetConnectionRoutersPolicyConfiguration(new FileConfiguration());
- }
-
- private void testSetConnectionRoutersPolicyConfiguration(ConfigurationImpl configuration) throws Throwable {
- Properties insertionOrderedProperties = new ConfigurationImpl.InsertionOrderedProperties();
- insertionOrderedProperties.put("connectionRouters.autoShard.localTargetFilter", "NULL|$STATEFUL_SET_ORDINAL");
- insertionOrderedProperties.put("connectionRouters.autoShard.keyType", KeyType.CLIENT_ID);
- insertionOrderedProperties.put("connectionRouters.autoShard.policyConfiguration", ConsistentHashModuloPolicy.NAME);
- insertionOrderedProperties.put("connectionRouters.autoShard.policyConfiguration.properties." + ConsistentHashModuloPolicy.MODULO, 2);
-
- insertionOrderedProperties.put("connectionRouters.symmetricRedirect.keyType", KeyType.CLIENT_ID);
- insertionOrderedProperties.put("connectionRouters.symmetricRedirect.keyFilter", "^.{3}");
- insertionOrderedProperties.put("connectionRouters.symmetricRedirect.policyConfiguration", ConsistentHashPolicy.NAME);
- insertionOrderedProperties.put("connectionRouters.symmetricRedirect.poolConfiguration.username", "guest-username");
- insertionOrderedProperties.put("connectionRouters.symmetricRedirect.poolConfiguration.password", "guest-password");
- insertionOrderedProperties.put("connectionRouters.symmetricRedirect.poolConfiguration.quorumSize", "2");
- insertionOrderedProperties.put("connectionRouters.symmetricRedirect.poolConfiguration.localTargetEnabled", Boolean.TRUE.toString());
- insertionOrderedProperties.put("connectionRouters.symmetricRedirect.poolConfiguration.discoveryGroupName", "discovery-group-1");
- insertionOrderedProperties.put("connectionRouters.symmetricRedirect.cacheConfiguration.persisted", Boolean.TRUE.toString());
- insertionOrderedProperties.put("connectionRouters.symmetricRedirect.cacheConfiguration.timeout", "1234");
-
- configuration.parsePrefixedProperties(insertionOrderedProperties, null);
-
- Assert.assertEquals(2, configuration.getConnectionRouters().size());
-
- ConnectionRouterConfiguration autoShardConfig = configuration.getConnectionRouters().stream().filter(
- connectionRouterConfig -> "autoShard".equals(connectionRouterConfig.getName())).findFirst().get();
- Assert.assertEquals(KeyType.CLIENT_ID, autoShardConfig.getKeyType());
- Assert.assertEquals("2", autoShardConfig.getPolicyConfiguration().getProperties().get(ConsistentHashModuloPolicy.MODULO));
- Assert.assertNull(autoShardConfig.getCacheConfiguration());
- Assert.assertNull(autoShardConfig.getPoolConfiguration());
-
- ConnectionRouterConfiguration symmetricRedirectConfig = configuration.getConnectionRouters().stream().filter(
- connectionRouterConfig -> "symmetricRedirect".equals(connectionRouterConfig.getName())).findFirst().get();
- Assert.assertEquals(KeyType.CLIENT_ID, symmetricRedirectConfig.getKeyType());
- Assert.assertEquals("^.{3}", symmetricRedirectConfig.getKeyFilter());
- Assert.assertEquals(ConsistentHashPolicy.NAME, symmetricRedirectConfig.getPolicyConfiguration().getName());
- Assert.assertNotNull(symmetricRedirectConfig.getPoolConfiguration());
- Assert.assertEquals("guest-username", symmetricRedirectConfig.getPoolConfiguration().getUsername());
- Assert.assertEquals("guest-password", symmetricRedirectConfig.getPoolConfiguration().getPassword());
- Assert.assertEquals(2, symmetricRedirectConfig.getPoolConfiguration().getQuorumSize());
- Assert.assertEquals(Boolean.TRUE, symmetricRedirectConfig.getPoolConfiguration().isLocalTargetEnabled());
- Assert.assertEquals("discovery-group-1", symmetricRedirectConfig.getPoolConfiguration().getDiscoveryGroupName());
- Assert.assertNotNull(symmetricRedirectConfig.getCacheConfiguration());
- Assert.assertEquals(Boolean.TRUE, symmetricRedirectConfig.getCacheConfiguration().isPersisted());
- Assert.assertEquals(1234, symmetricRedirectConfig.getCacheConfiguration().getTimeout());
- }
-
@Test
public void testAMQPConnectionsConfiguration() throws Throwable {
testAMQPConnectionsConfiguration(true);
@@ -2743,17 +2307,4 @@ public class ConfigurationImplTest extends ServerTestBase {
return this;
}
}
-
- @Override
- @Before
- public void setUp() throws Exception {
- super.setUp();
-
- conf = createConfiguration();
- }
-
- protected Configuration createConfiguration() throws Exception {
- return new ConfigurationImpl();
- }
-
}
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/DefaultsFileConfigurationTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/DefaultsFileConfigurationTest.java
index 4bed395d56..4e0c62e10d 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/DefaultsFileConfigurationTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/DefaultsFileConfigurationTest.java
@@ -26,12 +26,20 @@ import org.apache.activemq.artemis.core.config.ha.PrimaryOnlyPolicyConfiguration
import org.junit.Assert;
import org.junit.Test;
-public class DefaultsFileConfigurationTest extends ConfigurationImplTest {
+public class DefaultsFileConfigurationTest extends AbstractConfigurationTestBase {
@Override
+ protected Configuration createConfiguration() throws Exception {
+ FileConfiguration fc = new FileConfiguration();
+ FileDeploymentManager deploymentManager = new FileDeploymentManager("ConfigurationTest-defaults.xml");
+ deploymentManager.addDeployable(fc);
+ deploymentManager.readConfiguration();
+
+ return fc;
+ }
+
@Test
public void testDefaults() {
-
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize(), conf.getScheduledThreadPoolMaxSize());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultThreadPoolMaxSize(), conf.getThreadPoolMaxSize());
@@ -150,16 +158,4 @@ public class DefaultsFileConfigurationTest extends ConfigurationImplTest {
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultLoggingMetrics(), conf.getMetricsConfiguration().isLogging());
}
-
- // Protected ---------------------------------------------------------------------------------------------
-
- @Override
- protected Configuration createConfiguration() throws Exception {
- FileConfiguration fc = new FileConfiguration();
- FileDeploymentManager deploymentManager = new FileDeploymentManager("ConfigurationTest-defaults.xml");
- deploymentManager.addDeployable(fc);
- deploymentManager.readConfiguration();
-
- return fc;
- }
}
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationBrokerConnectionEncryptedTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationBrokerConnectionEncryptedTest.java
index ab70a0049d..b86bea406f 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationBrokerConnectionEncryptedTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationBrokerConnectionEncryptedTest.java
@@ -24,16 +24,19 @@ import org.apache.activemq.artemis.core.config.amqpBrokerConnectivity.AMQPBroker
import org.junit.Assert;
import org.junit.Test;
-public class FileConfigurationBrokerConnectionEncryptedTest extends ConfigurationImplTest {
+public class FileConfigurationBrokerConnectionEncryptedTest extends AbstractConfigurationTestBase {
protected String getConfigurationName() {
return "ConfigurationTest-broker-connection-encrypted-config.xml";
}
@Override
- @Test
- public void testDefaults() {
- // empty
+ protected Configuration createConfiguration() throws Exception {
+ FileConfiguration fc = new FileConfiguration();
+ FileDeploymentManager deploymentManager = new FileDeploymentManager(getConfigurationName());
+ deploymentManager.addDeployable(fc);
+ deploymentManager.readConfiguration();
+ return fc;
}
@Test
@@ -71,16 +74,25 @@ public class FileConfigurationBrokerConnectionEncryptedTest extends Configuratio
Assert.assertTrue("enc-test configuration is not present", encTest);
Assert.assertTrue("plain-test configuration is not present", plainTest);
Assert.assertTrue("empty-test configuration is not present", emptyTest);
+ }
+ @Test
+ public void testSetGetAttributes() throws Exception {
+ doSetGetAttributesTestImpl(conf);
}
- @Override
- protected Configuration createConfiguration() throws Exception {
- FileConfiguration fc = new FileConfiguration();
- FileDeploymentManager deploymentManager = new FileDeploymentManager(getConfigurationName());
- deploymentManager.addDeployable(fc);
- deploymentManager.readConfiguration();
- return fc;
+ @Test
+ public void testGetSetInterceptors() {
+ doGetSetInterceptorsTestImpl(conf);
}
+ @Test
+ public void testSerialize() throws Exception {
+ doSerializeTestImpl(conf);
+ }
+
+ @Test
+ public void testSetConnectionRoutersPolicyConfiguration() throws Throwable {
+ doSetConnectionRoutersPolicyConfigurationTestImpl((ConfigurationImpl) conf);
+ }
}
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationDbEncryptedPassTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationDbEncryptedPassTest.java
index cad1f638b6..d281d00156 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationDbEncryptedPassTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationDbEncryptedPassTest.java
@@ -22,17 +22,19 @@ import org.apache.activemq.artemis.utils.SensitiveDataCodec;
import org.junit.Assert;
import org.junit.Test;
-public class FileConfigurationDbEncryptedPassTest extends ConfigurationImplTest {
-
+public class FileConfigurationDbEncryptedPassTest extends AbstractConfigurationTestBase {
protected String getConfigurationName() {
return "ConfigurationTest-db-encrypted-pass-config.xml";
}
@Override
- @Test
- public void testDefaults() {
- // empty
+ protected Configuration createConfiguration() throws Exception {
+ FileConfiguration fc = new FileConfiguration();
+ FileDeploymentManager deploymentManager = new FileDeploymentManager(getConfigurationName());
+ deploymentManager.addDeployable(fc);
+ deploymentManager.readConfiguration();
+ return fc;
}
@Test
@@ -40,13 +42,24 @@ public class FileConfigurationDbEncryptedPassTest extends ConfigurationImplTest
Assert.assertTrue(MySensitiveStringCodec.decoded);
}
- @Override
- protected Configuration createConfiguration() throws Exception {
- FileConfiguration fc = new FileConfiguration();
- FileDeploymentManager deploymentManager = new FileDeploymentManager(getConfigurationName());
- deploymentManager.addDeployable(fc);
- deploymentManager.readConfiguration();
- return fc;
+ @Test
+ public void testSetGetAttributes() throws Exception {
+ doSetGetAttributesTestImpl(conf);
+ }
+
+ @Test
+ public void testGetSetInterceptors() {
+ doGetSetInterceptorsTestImpl(conf);
+ }
+
+ @Test
+ public void testSerialize() throws Exception {
+ doSerializeTestImpl(conf);
+ }
+
+ @Test
+ public void testSetConnectionRoutersPolicyConfiguration() throws Throwable {
+ doSetConnectionRoutersPolicyConfigurationTestImpl((ConfigurationImpl) conf);
}
public static class MySensitiveStringCodec implements SensitiveDataCodec<String> {
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationSecurityPluginTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationSecurityPluginTest.java
index b3a8b5742d..693b22bf78 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationSecurityPluginTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationSecurityPluginTest.java
@@ -29,14 +29,21 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-public class FileConfigurationSecurityPluginTest extends ConfigurationImplTest {
-
+public class FileConfigurationSecurityPluginTest extends AbstractConfigurationTestBase {
protected String getConfigurationName() {
return "ConfigurationTest-security-plugin-config.xml";
}
@Override
+ protected Configuration createConfiguration() throws Exception {
+ FileConfiguration fc = new FileConfiguration();
+ FileDeploymentManager deploymentManager = new FileDeploymentManager(getConfigurationName());
+ deploymentManager.addDeployable(fc);
+ deploymentManager.readConfiguration();
+ return fc;
+ }
+
@Test
public void testDefaults() {
List<SecuritySettingPlugin> securitySettingPlugins = conf.getSecuritySettingPlugins();
@@ -45,15 +52,27 @@ public class FileConfigurationSecurityPluginTest extends ConfigurationImplTest {
Assert.assertEquals("hello", MyPlugin.options.get("setting2"));
}
- @Override
- protected Configuration createConfiguration() throws Exception {
- FileConfiguration fc = new FileConfiguration();
- FileDeploymentManager deploymentManager = new FileDeploymentManager(getConfigurationName());
- deploymentManager.addDeployable(fc);
- deploymentManager.readConfiguration();
- return fc;
+ @Test
+ public void testSetGetAttributes() throws Exception {
+ doSetGetAttributesTestImpl(conf);
+ }
+
+ @Test
+ public void testGetSetInterceptors() {
+ doGetSetInterceptorsTestImpl(conf);
+ }
+
+ @Test
+ public void testSerialize() throws Exception {
+ doSerializeTestImpl(conf);
+ }
+
+ @Test
+ public void testSetConnectionRoutersPolicyConfiguration() throws Throwable {
+ doSetConnectionRoutersPolicyConfigurationTestImpl((ConfigurationImpl) conf);
}
+ // Referenced by the configuration file
public static class MyPlugin implements SecuritySettingPlugin {
private static Map<String, String> options;
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
index 84a3273ad9..214b6e7b65 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
@@ -84,7 +84,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
-public class FileConfigurationTest extends ConfigurationImplTest {
+public class FileConfigurationTest extends AbstractConfigurationTestBase {
@BeforeClass
public static void setupProperties() {
@@ -116,8 +116,18 @@ public class FileConfigurationTest extends ConfigurationImplTest {
}
@Override
+ protected Configuration createConfiguration() throws Exception {
+ // This may be set for the entire testsuite, but on this test we need this out
+ System.clearProperty("brokerconfig.maxDiskUsage");
+ FileConfiguration fc = new FileConfiguration();
+ FileDeploymentManager deploymentManager = new FileDeploymentManager(getConfigurationName());
+ deploymentManager.addDeployable(fc);
+ deploymentManager.readConfiguration();
+ return fc;
+ }
+
@Test
- public void testDefaults() {
+ public void testFileConfiguration() {
// Check they match the values from the test file
Assert.assertEquals("SomeNameForUseOnTheApplicationServer", conf.getName());
Assert.assertEquals(false, conf.isPersistenceEnabled());
@@ -927,15 +937,24 @@ public class FileConfigurationTest extends ConfigurationImplTest {
assertEquals("value3", metricPluginOptions.get("key3"));
}
- @Override
- protected Configuration createConfiguration() throws Exception {
- // This may be set for the entire testsuite, but on this test we need this out
- System.clearProperty("brokerconfig.maxDiskUsage");
- FileConfiguration fc = new FileConfiguration();
- FileDeploymentManager deploymentManager = new FileDeploymentManager(getConfigurationName());
- deploymentManager.addDeployable(fc);
- deploymentManager.readConfiguration();
- return fc;
+ @Test
+ public void testSetGetAttributes() throws Exception {
+ doSetGetAttributesTestImpl(conf);
+ }
+
+ @Test
+ public void testGetSetInterceptors() {
+ doGetSetInterceptorsTestImpl(conf);
+ }
+
+ @Test
+ public void testSerialize() throws Exception {
+ doSerializeTestImpl(conf);
+ }
+
+ @Test
+ public void testSetConnectionRoutersPolicyConfiguration() throws Throwable {
+ doSetConnectionRoutersPolicyConfigurationTestImpl(new FileConfiguration());
}
private Configuration createConfiguration(String filename) throws Exception {
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeConfigurationTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeConfigurationTest.java
index 8206ba91f9..8422d9fd7d 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeConfigurationTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeConfigurationTest.java
@@ -22,6 +22,11 @@ import org.junit.BeforeClass;
public class FileXIncludeConfigurationTest extends FileConfigurationTest {
+ @Override
+ protected String getConfigurationName() {
+ return "ConfigurationTest-xinclude-config.xml";
+ }
+
public FileXIncludeConfigurationTest(boolean xxeEnabled) {
super(xxeEnabled);
Assume.assumeTrue(xxeEnabled);
@@ -44,9 +49,4 @@ public class FileXIncludeConfigurationTest extends FileConfigurationTest {
System.clearProperty("trueProp");
System.clearProperty("ninetyTwoProp");
}
-
- @Override
- protected String getConfigurationName() {
- return "ConfigurationTest-xinclude-config.xml";
- }
}
\ No newline at end of file
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeSchemaConfigurationTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeSchemaConfigurationTest.java
index 87b9de6488..a45e64c73a 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeSchemaConfigurationTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeSchemaConfigurationTest.java
@@ -20,9 +20,15 @@ import org.apache.activemq.artemis.core.server.plugin.ActiveMQServerBasePlugin;
import org.junit.AfterClass;
import org.junit.Assume;
import org.junit.BeforeClass;
+import org.junit.Test;
public class FileXIncludeSchemaConfigurationTest extends FileConfigurationTest {
+ @Override
+ protected String getConfigurationName() {
+ return "ConfigurationTest-xinclude-schema-config.xml";
+ }
+
public FileXIncludeSchemaConfigurationTest(boolean xxeEnabled) {
super(xxeEnabled);
Assume.assumeTrue(xxeEnabled);
@@ -47,10 +53,11 @@ public class FileXIncludeSchemaConfigurationTest extends FileConfigurationTest {
}
@Override
+ @Test
public void testSerialize() throws Exception {
- // ConfigurationImplTest#testSerialize() assumes the one plugin it registers is the only one in the configuration.
+ // super#testSerialize() assumes the one plugin it registers is the only one in the configuration.
- // Check the expected 2 from the include file are present
+ // Check the expected 2 plugins from the include file are present
assertEquals("included broker plugins are not present", 2, conf.getBrokerPlugins().size());
// Clear the list
@@ -61,9 +68,4 @@ public class FileXIncludeSchemaConfigurationTest extends FileConfigurationTest {
// Allow the test to proceed
super.testSerialize();
}
-
- @Override
- protected String getConfigurationName() {
- return "ConfigurationTest-xinclude-schema-config.xml";
- }
}
(activemq-artemis) 04/06: ARTEMIS-4778: split two Nested test classes (one parameterized, other not) into their own class files
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 3c84f26413bf140244beda32eb46dc5559cecf08
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Tue May 21 16:17:55 2024 +0100
ARTEMIS-4778: split two Nested test classes (one parameterized, other not) into their own class files
---
.../amqp/AmqpFlowControlFailDispositionTests.java | 103 ++++++++++++
.../amqp/AmqpFlowControlFailOrdinaryTests.java | 94 +++++++++++
.../integration/amqp/AmqpFlowControlFailTest.java | 175 ---------------------
3 files changed, 197 insertions(+), 175 deletions(-)
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFlowControlFailDispositionTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFlowControlFailDispositionTests.java
new file mode 100644
index 0000000000..484386aed6
--- /dev/null
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFlowControlFailDispositionTests.java
@@ -0,0 +1,103 @@
+/*
+ * 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.amqp;
+
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.transport.amqp.client.AmqpClient;
+import org.apache.activemq.transport.amqp.client.AmqpConnection;
+import org.apache.activemq.transport.amqp.client.AmqpMessage;
+import org.apache.activemq.transport.amqp.client.AmqpSender;
+import org.apache.activemq.transport.amqp.client.AmqpSession;
+import org.apache.qpid.proton.amqp.Symbol;
+import org.apache.qpid.proton.amqp.messaging.Accepted;
+import org.apache.qpid.proton.amqp.messaging.Modified;
+import org.apache.qpid.proton.amqp.messaging.Rejected;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Map;
+
+@RunWith(Parameterized.class)
+public class AmqpFlowControlFailDispositionTests extends JMSClientTestSupport {
+
+ @Parameterized.Parameter()
+ public boolean useModified;
+
+ @Parameterized.Parameter(1)
+ public Symbol[] outcomes;
+
+ @Parameterized.Parameter(2)
+ public String expectedMessage;
+
+ @Parameterized.Parameters(name = "useModified={0}")
+ public static Collection<Object[]> parameters() {
+ return Arrays.asList(new Object[][] {
+ {true, new Symbol[]{Accepted.DESCRIPTOR_SYMBOL, Rejected.DESCRIPTOR_SYMBOL, Modified.DESCRIPTOR_SYMBOL}, "failure at remote"},
+ {true, new Symbol[]{Accepted.DESCRIPTOR_SYMBOL, Rejected.DESCRIPTOR_SYMBOL}, "[condition = amqp:resource-limit-exceeded]"},
+ {false, new Symbol[]{Accepted.DESCRIPTOR_SYMBOL, Rejected.DESCRIPTOR_SYMBOL, Modified.DESCRIPTOR_SYMBOL}, "[condition = amqp:resource-limit-exceeded]"},
+ {false, new Symbol[]{}, "[condition = amqp:resource-limit-exceeded]"}
+ });
+ }
+
+ @Override
+ protected void configureAddressPolicy(ActiveMQServer server) {
+ AddressSettings addressSettings = server.getAddressSettingsRepository().getMatch("#");
+ addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.FAIL);
+ addressSettings.setMaxSizeBytes(1000);
+ server.getAddressSettingsRepository().addMatch("#", addressSettings);
+ }
+
+ @Override
+ protected void configureAMQPAcceptorParameters(Map<String, Object> params) {
+ params.put("amqpUseModifiedForTransientDeliveryErrors", useModified);
+ }
+
+
+ @Test(timeout = 10_000)
+ public void testAddressFullDisposition() throws Exception {
+ AmqpClient client = createAmqpClient(getBrokerAmqpConnectionURI());
+ AmqpConnection connection = client.connect();
+ try {
+ AmqpSession session = connection.createSession();
+ AmqpSender sender = session.createSender(getQueueName(), null, null, outcomes);
+ boolean rejected = false;
+ for (int i = 0; i < 1000; i++) {
+ final AmqpMessage message = new AmqpMessage();
+ byte[] payload = new byte[10];
+ message.setBytes(payload);
+ try {
+ sender.send(message);
+ } catch (IOException e) {
+ rejected = true;
+ assertTrue(String.format("Unexpected message expected %s to contain %s", e.getMessage(), expectedMessage),
+ e.getMessage().contains(expectedMessage));
+ break;
+ }
+ }
+
+ assertTrue("Expected messages to be refused by broker", rejected);
+ } finally {
+ connection.close();
+ }
+ }
+}
\ No newline at end of file
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFlowControlFailOrdinaryTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFlowControlFailOrdinaryTests.java
new file mode 100644
index 0000000000..f23aee8115
--- /dev/null
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFlowControlFailOrdinaryTests.java
@@ -0,0 +1,94 @@
+/*
+ * 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.amqp;
+
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.transport.amqp.client.AmqpClient;
+import org.apache.activemq.transport.amqp.client.AmqpConnection;
+import org.apache.activemq.transport.amqp.client.AmqpMessage;
+import org.apache.activemq.transport.amqp.client.AmqpReceiver;
+import org.apache.activemq.transport.amqp.client.AmqpSender;
+import org.apache.activemq.transport.amqp.client.AmqpSession;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+public class AmqpFlowControlFailOrdinaryTests extends JMSClientTestSupport {
+
+ @Override
+ protected void configureAddressPolicy(ActiveMQServer server) {
+ AddressSettings addressSettings = server.getAddressSettingsRepository().getMatch("#");
+ addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.FAIL);
+ addressSettings.setMaxSizeBytes(1000);
+ server.getAddressSettingsRepository().addMatch("#", addressSettings);
+ }
+
+ @Test
+ public void testMessagesNotSent() throws Exception {
+ AmqpClient client = createAmqpClient(getBrokerAmqpConnectionURI());
+ AmqpConnection connection = client.connect();
+ int messagesSent = 0;
+ try {
+ AmqpSession session = connection.createSession();
+ AmqpSender sender = session.createSender(getQueueName());
+ boolean rejected = false;
+ for (int i = 0; i < 1000; i++) {
+ final AmqpMessage message = new AmqpMessage();
+ byte[] payload = new byte[10];
+ message.setBytes(payload);
+ try {
+ sender.send(message);
+ messagesSent++;
+ } catch (IOException e) {
+ rejected = true;
+ break;
+ }
+ }
+ assertTrue(rejected);
+ rejected = false;
+ AmqpSession session2 = connection.createSession();
+ AmqpReceiver receiver = session2.createReceiver(getQueueName());
+ receiver.flow(messagesSent);
+ for (int i = 0; i < messagesSent; i++) {
+ AmqpMessage receive = receiver.receive(5, TimeUnit.SECONDS);
+ Assert.assertNotNull(receive);
+ receive.accept();
+ }
+ receiver.close();
+ session2.close();
+
+ for (int i = 0; i < 1000; i++) {
+ final AmqpMessage message = new AmqpMessage();
+ byte[] payload = new byte[100];
+ message.setBytes(payload);
+ try {
+ sender.send(message);
+ } catch (IOException e) {
+ rejected = true;
+ break;
+ }
+ }
+ assertTrue(rejected);
+ } finally {
+ connection.close();
+ }
+ }
+}
\ No newline at end of file
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFlowControlFailTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFlowControlFailTest.java
deleted file mode 100644
index 564460c0a3..0000000000
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFlowControlFailTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * 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.amqp;
-
-import org.apache.activemq.artemis.core.server.ActiveMQServer;
-import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
-import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
-import org.apache.activemq.transport.amqp.client.AmqpClient;
-import org.apache.activemq.transport.amqp.client.AmqpConnection;
-import org.apache.activemq.transport.amqp.client.AmqpMessage;
-import org.apache.activemq.transport.amqp.client.AmqpReceiver;
-import org.apache.activemq.transport.amqp.client.AmqpSender;
-import org.apache.activemq.transport.amqp.client.AmqpSession;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.qpid.proton.amqp.Symbol;
-import org.apache.qpid.proton.amqp.messaging.Accepted;
-import org.apache.qpid.proton.amqp.messaging.Modified;
-import org.apache.qpid.proton.amqp.messaging.Rejected;
-
-@RunWith(Enclosed.class)
-public class AmqpFlowControlFailTest {
-
- @RunWith(Parameterized.class)
- public static class AmqpFlowControlFailDispositionTests extends JMSClientTestSupport {
-
- @Parameterized.Parameter()
- public boolean useModified;
-
- @Parameterized.Parameter(1)
- public Symbol[] outcomes;
-
- @Parameterized.Parameter(2)
- public String expectedMessage;
-
- @Parameterized.Parameters(name = "useModified={0}")
- public static Collection<Object[]> parameters() {
- return Arrays.asList(new Object[][] {
- {true, new Symbol[]{Accepted.DESCRIPTOR_SYMBOL, Rejected.DESCRIPTOR_SYMBOL, Modified.DESCRIPTOR_SYMBOL}, "failure at remote"},
- {true, new Symbol[]{Accepted.DESCRIPTOR_SYMBOL, Rejected.DESCRIPTOR_SYMBOL}, "[condition = amqp:resource-limit-exceeded]"},
- {false, new Symbol[]{Accepted.DESCRIPTOR_SYMBOL, Rejected.DESCRIPTOR_SYMBOL, Modified.DESCRIPTOR_SYMBOL}, "[condition = amqp:resource-limit-exceeded]"},
- {false, new Symbol[]{}, "[condition = amqp:resource-limit-exceeded]"}
- });
- }
-
- @Override
- protected void configureAddressPolicy(ActiveMQServer server) {
- AmqpFlowControlFailTest.configureAddressPolicy(server);
- }
-
- @Override
- protected void configureAMQPAcceptorParameters(Map<String, Object> params) {
- params.put("amqpUseModifiedForTransientDeliveryErrors", useModified);
- }
-
-
- @Test(timeout = 10_000)
- public void testAddressFullDisposition() throws Exception {
- AmqpClient client = createAmqpClient(getBrokerAmqpConnectionURI());
- AmqpConnection connection = client.connect();
- try {
- AmqpSession session = connection.createSession();
- AmqpSender sender = session.createSender(getQueueName(), null, null, outcomes);
- boolean rejected = false;
- for (int i = 0; i < 1000; i++) {
- final AmqpMessage message = new AmqpMessage();
- byte[] payload = new byte[10];
- message.setBytes(payload);
- try {
- sender.send(message);
- } catch (IOException e) {
- rejected = true;
- assertTrue(String.format("Unexpected message expected %s to contain %s", e.getMessage(), expectedMessage),
- e.getMessage().contains(expectedMessage));
- break;
- }
- }
-
- assertTrue("Expected messages to be refused by broker", rejected);
- } finally {
- connection.close();
- }
- }
- }
-
- public static class AmqpFlowControlFailOrdinaryTests extends JMSClientTestSupport {
-
- @Override
- protected void configureAddressPolicy(ActiveMQServer server) {
- AmqpFlowControlFailTest.configureAddressPolicy(server);
- }
-
- @Test
- public void testMessagesNotSent() throws Exception {
- AmqpClient client = createAmqpClient(getBrokerAmqpConnectionURI());
- AmqpConnection connection = client.connect();
- int messagesSent = 0;
- try {
- AmqpSession session = connection.createSession();
- AmqpSender sender = session.createSender(getQueueName());
- boolean rejected = false;
- for (int i = 0; i < 1000; i++) {
- final AmqpMessage message = new AmqpMessage();
- byte[] payload = new byte[10];
- message.setBytes(payload);
- try {
- sender.send(message);
- messagesSent++;
- } catch (IOException e) {
- rejected = true;
- break;
- }
- }
- assertTrue(rejected);
- rejected = false;
- AmqpSession session2 = connection.createSession();
- AmqpReceiver receiver = session2.createReceiver(getQueueName());
- receiver.flow(messagesSent);
- for (int i = 0; i < messagesSent; i++) {
- AmqpMessage receive = receiver.receive(5, TimeUnit.SECONDS);
- Assert.assertNotNull(receive);
- receive.accept();
- }
- receiver.close();
- session2.close();
-
- for (int i = 0; i < 1000; i++) {
- final AmqpMessage message = new AmqpMessage();
- byte[] payload = new byte[100];
- message.setBytes(payload);
- try {
- sender.send(message);
- } catch (IOException e) {
- rejected = true;
- break;
- }
- }
- assertTrue(rejected);
- } finally {
- connection.close();
- }
- }
- }
-
- private static void configureAddressPolicy(final ActiveMQServer server) {
- AddressSettings addressSettings = server.getAddressSettingsRepository().getMatch("#");
- addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.FAIL);
- addressSettings.setMaxSizeBytes(1000);
- server.getAddressSettingsRepository().addMatch("#", addressSettings);
- }
-}