You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@artemis.apache.org by ta...@apache.org on 2026/02/02 17:53:58 UTC
(artemis) branch main updated (c6fe0f7493 -> d657f960c0)
This is an automated email from the ASF dual-hosted git repository.
tabish pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/artemis.git
from c6fe0f7493 ARTEMIS-5874 mitigate dead-lock in STOMP
new 9ee3f1598d ARTEMIS-5854 consumer mngmnt API not working
new d657f960c0 ARTEMIS-5854 add integration tests
The 2 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:
.../core/management/impl/view/ConsumerView.java | 3 +-
.../view/predicate/ConsumerFilterPredicate.java | 4 +-
.../core/management/impl/view/AddressViewTest.java | 49 +++
.../management/impl/view/ConnectionViewTest.java | 49 +++
.../management/impl/view/ConsumerViewTest.java | 338 +++++++++++++++++++++
.../management/impl/view/ProducerViewTest.java | 49 +++
.../core/management/impl/view/QueueViewTest.java | 49 +++
.../impl/view/SessionViewTest.java} | 35 +--
.../core/management/impl/view/ViewTest.java | 160 ++--------
.../management/ActiveMQServerControlTest.java | 69 +++++
10 files changed, 650 insertions(+), 155 deletions(-)
create mode 100644 artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/AddressViewTest.java
create mode 100644 artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/ConnectionViewTest.java
create mode 100644 artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/ConsumerViewTest.java
create mode 100644 artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/ProducerViewTest.java
create mode 100644 artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/QueueViewTest.java
copy artemis-server/src/test/java/org/apache/activemq/artemis/core/{server/routing/policies/PolicyFactoryResolverTest.java => management/impl/view/SessionViewTest.java} (52%)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@artemis.apache.org
For additional commands, e-mail: commits-help@artemis.apache.org
(artemis) 01/02: ARTEMIS-5854 consumer mngmnt API not working
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tabish pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/artemis.git
commit 9ee3f1598d6d3083c526c4b88a66c4f53f76a190
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Mon Jan 26 21:54:58 2026 -0600
ARTEMIS-5854 consumer mngmnt API not working
This commit does the following:
- Allows `lastDeliveredTime` and `lastAcknowledgedTime` to be filtered
via the management API.
- Adds unit tests for all such attributes to verify they are
filterable.
- Looks up the correct value on the server when filtering on
`messagesDelivered`.
- Breaks up `ViewTest` into corresponding classes so all attributes can
be unit tested eventually.
---
.../core/management/impl/view/ConsumerView.java | 3 +-
.../view/predicate/ConsumerFilterPredicate.java | 4 +-
.../core/management/impl/view/AddressViewTest.java | 49 +++
.../management/impl/view/ConnectionViewTest.java | 49 +++
.../management/impl/view/ConsumerViewTest.java | 338 +++++++++++++++++++++
.../management/impl/view/ProducerViewTest.java | 49 +++
.../core/management/impl/view/QueueViewTest.java | 49 +++
.../core/management/impl/view/SessionViewTest.java | 47 +++
.../core/management/impl/view/ViewTest.java | 160 ++--------
9 files changed, 610 insertions(+), 138 deletions(-)
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ConsumerView.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ConsumerView.java
index 3768c9568f..a64f30aac9 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ConsumerView.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ConsumerView.java
@@ -121,12 +121,11 @@ public class ConsumerView extends ActiveMQAbstractView<ServerConsumer> {
}
public static String checkConsumerStatus(ServerConsumer consumer, ActiveMQServer server) {
- if (server.getRemotingService().getConnection((consumer).getConnectionID()) == null) {
+ if (server.getRemotingService() != null && server.getRemotingService().getConnection((consumer).getConnectionID()) == null) {
return CONSUMER_STATUS_ORPHANED;
} else {
return CONSUMER_STATUS_OK;
}
-
}
@Override
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/ConsumerFilterPredicate.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/ConsumerFilterPredicate.java
index 8872a01700..50f4f573cc 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/ConsumerFilterPredicate.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/ConsumerFilterPredicate.java
@@ -54,10 +54,12 @@ public class ConsumerFilterPredicate extends ActiveMQFilterPredicate<ServerConsu
matches(server.getSessionByID(consumer.getSessionID()).getRemotingConnection().getTransportConnection().getRemoteAddress());
case MESSAGES_IN_TRANSIT -> matches(consumer.getMessagesInTransit());
case MESSAGES_IN_TRANSIT_SIZE -> matches(consumer.getMessagesInTransitSize());
- case MESSAGES_DELIVERED -> matches(consumer.getDeliveringMessages());
+ case MESSAGES_DELIVERED -> matches(consumer.getMessagesDelivered());
case MESSAGES_DELIVERED_SIZE -> matches(consumer.getMessagesDeliveredSize());
case MESSAGES_ACKNOWLEDGED -> matches(consumer.getMessagesAcknowledged());
case MESSAGES_ACKNOWLEDGED_AWAITING_COMMIT -> matches(consumer.getMessagesAcknowledgedAwaitingCommit());
+ case LAST_ACKNOWLEDGED_TIME -> matches(consumer.getLastAcknowledgedTime());
+ case LAST_DELIVERED_TIME -> matches(consumer.getLastDeliveredTime());
default -> true;
};
}
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/AddressViewTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/AddressViewTest.java
new file mode 100644
index 0000000000..4cbbadd5ec
--- /dev/null
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/AddressViewTest.java
@@ -0,0 +1,49 @@
+/*
+ * 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.management.impl.view;
+
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+public class AddressViewTest extends ViewTest {
+
+ @Test
+ public void testDefaultViewNullOptions() {
+ AddressView addressView = new AddressView(Mockito.mock(ActiveMQServer.class));
+ // sanity check to ensure this doesn't just blow up
+ addressView.setOptions(null);
+ }
+
+ @Test
+ public void testDefaultViewEmptyOptions() {
+ AddressView addressView = new AddressView(Mockito.mock(ActiveMQServer.class));
+ // sanity check to ensure this doesn't just blow up
+ addressView.setOptions("");
+ }
+
+ @Test
+ public void testViewLegacySort() {
+ AddressView view = new AddressView(Mockito.mock(ActiveMQServer.class));
+ assertNotEquals("name", view.getDefaultOrderColumn());
+ view.setOptions(createLegacyJsonFilter("name", "EQUALS", "123", "name", "asc"));
+ assertEquals("name", view.getSortField());
+ }
+}
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/ConnectionViewTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/ConnectionViewTest.java
new file mode 100644
index 0000000000..c6e894ffdc
--- /dev/null
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/ConnectionViewTest.java
@@ -0,0 +1,49 @@
+/*
+ * 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.management.impl.view;
+
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+public class ConnectionViewTest extends ViewTest {
+
+ @Test
+ public void testDefaultViewNullOptions() {
+ ConnectionView connectionView = new ConnectionView(Mockito.mock(ActiveMQServer.class));
+ // sanity check to ensure this doesn't just blow up
+ connectionView.setOptions(null);
+ }
+
+ @Test
+ public void testDefaultViewEmptyOptions() {
+ ConnectionView connectionView = new ConnectionView(Mockito.mock(ActiveMQServer.class));
+ // sanity check to ensure this doesn't just blow up
+ connectionView.setOptions("");
+ }
+
+ @Test
+ public void testViewLegacySort() {
+ ConnectionView view = new ConnectionView(Mockito.mock(ActiveMQServer.class));
+ assertNotEquals("protocol", view.getDefaultOrderColumn());
+ view.setOptions(createLegacyJsonFilter("protocol", "EQUALS", "123", "protocol", "asc"));
+ assertEquals("protocol", view.getSortField());
+ }
+}
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/ConsumerViewTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/ConsumerViewTest.java
new file mode 100644
index 0000000000..ea438127b5
--- /dev/null
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/ConsumerViewTest.java
@@ -0,0 +1,338 @@
+/*
+ * 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.management.impl.view;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.activemq.artemis.api.core.JsonUtil;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.ServerConsumer;
+import org.apache.activemq.artemis.core.server.ServerSession;
+import org.apache.activemq.artemis.core.server.impl.ServerConsumerImpl;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.spi.core.remoting.Connection;
+import org.apache.activemq.artemis.utils.RandomUtil;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+public class ConsumerViewTest extends ViewTest {
+
+ private static final String MOCK_VALIDATED_USER = "myValidatedUser";
+ private static final String MOCK_USER = "myUser";
+ private static final String MOCK_PROTOCOL = "myProtocol";
+ private static final String MOCK_CLIENT_ID = "myClientId";
+ private static final String MOCK_LOCAL_ADDRESS = "myLocalAddress";
+ private static final String MOCK_REMOTE_ADDRESS = "myRemoteAddress";
+
+ @Test
+ public void testDefaultViewNullOptions() {
+ ConsumerView consumerView = new ConsumerView(Mockito.mock(ActiveMQServer.class));
+ // sanity check to ensure this doesn't just blow up
+ consumerView.setOptions(null);
+ }
+
+ @Test
+ public void testDefaultViewEmptyOptions() {
+ ConsumerView consumerView = new ConsumerView(Mockito.mock(ActiveMQServer.class));
+ // sanity check to ensure this doesn't just blow up
+ consumerView.setOptions("");
+ }
+
+ @Test
+ public void testViewLegacySort() {
+ ConsumerView view = new ConsumerView(Mockito.mock(ActiveMQServer.class));
+ assertNotEquals("user", view.getDefaultOrderColumn());
+ view.setOptions(createLegacyJsonFilter("user", "EQUALS", "123", "user", "asc"));
+ assertEquals("user", view.getSortField());
+ }
+
+ @Test
+ public void testFilterById() {
+ testFilter(Mockito.mock(ActiveMQServer.class),
+ ConsumerField.ID.getName(),
+ sc -> Mockito.when(sc.getSequentialID()).thenReturn(123L),
+ sc -> Mockito.when(sc.getSequentialID()).thenReturn(456L),
+ "123");
+ }
+
+ @Test
+ public void testFilterBySessionId() {
+ testFilter(Mockito.mock(ActiveMQServer.class),
+ ConsumerField.SESSION.getName(),
+ sc -> Mockito.when(sc.getSessionID()).thenReturn("123"),
+ sc -> Mockito.when(sc.getSessionID()).thenReturn("456"),
+ "123");
+ }
+
+ @Test
+ public void testFilterByUser() {
+ ActiveMQServer server = Mockito.mock(ActiveMQServer.class);
+
+ createMockSessionInServer(server, "123", false);
+ createMockSessionInServer(server, "456", true);
+
+ testFilter(server,
+ ConsumerField.USER.getName(),
+ sc -> Mockito.when(sc.getSessionID()).thenReturn("123"),
+ sc -> Mockito.when(sc.getSessionID()).thenReturn("456"),
+ MOCK_USER);
+ }
+
+ @Test
+ public void testFilterByValidatedUser() {
+ ActiveMQServer server = Mockito.mock(ActiveMQServer.class);
+
+ createMockSessionInServer(server, "123", false);
+ createMockSessionInServer(server, "456", true);
+
+ testFilter(server,
+ ConsumerField.VALIDATED_USER.getName(),
+ sc -> Mockito.when(sc.getSessionID()).thenReturn("123"),
+ sc -> Mockito.when(sc.getSessionID()).thenReturn("456"),
+ MOCK_VALIDATED_USER);
+ }
+
+ @Test
+ public void testFilterByAddress() {
+ testFilter(Mockito.mock(ActiveMQServer.class),
+ ConsumerField.ADDRESS.getName(),
+ sc -> {
+ Queue queue = Mockito.mock(Queue.class);
+ Mockito.when(queue.getAddress()).thenReturn(SimpleString.of("123"));
+ Mockito.when(sc.getQueue()).thenReturn(queue);
+ },
+ sc -> {
+ Queue queue = Mockito.mock(Queue.class);
+ Mockito.when(queue.getAddress()).thenReturn(SimpleString.of("456"));
+ Mockito.when(sc.getQueue()).thenReturn(queue);
+ },
+ "123");
+ }
+
+ @Test
+ public void testFilterByQueue() {
+ testFilter(Mockito.mock(ActiveMQServer.class),
+ ConsumerField.QUEUE.getName(),
+ sc -> {
+ Queue queue = Mockito.mock(Queue.class);
+ Mockito.when(queue.getName()).thenReturn(SimpleString.of("123"));
+ Mockito.when(sc.getQueue()).thenReturn(queue);
+ },
+ sc -> {
+ Queue queue = Mockito.mock(Queue.class);
+ Mockito.when(queue.getName()).thenReturn(SimpleString.of("456"));
+ Mockito.when(sc.getQueue()).thenReturn(queue);
+ },
+ "123");
+ }
+
+ @Test
+ public void testFilterByFilterString() {
+ testFilter(Mockito.mock(ActiveMQServer.class),
+ ConsumerField.FILTER.getName(),
+ sc -> Mockito.when(sc.getFilterString()).thenReturn(SimpleString.of("123")),
+ sc -> Mockito.when(sc.getFilterString()).thenReturn(SimpleString.of("456")),
+ "123");
+ }
+
+ @Test
+ public void testFilterByProtocol() {
+ ActiveMQServer server = Mockito.mock(ActiveMQServer.class);
+
+ createMockSessionInServer(server, "123", false);
+ createMockSessionInServer(server, "456", true);
+
+ testFilter(server,
+ ConsumerField.PROTOCOL.getName(),
+ sc -> Mockito.when(sc.getSessionID()).thenReturn("123"),
+ sc -> Mockito.when(sc.getSessionID()).thenReturn("456"),
+ MOCK_PROTOCOL);
+ }
+
+ @Test
+ public void testFilterByClientId() {
+ ActiveMQServer server = Mockito.mock(ActiveMQServer.class);
+
+ createMockSessionInServer(server, "123", false);
+ createMockSessionInServer(server, "456", true);
+
+ testFilter(server,
+ ConsumerField.CLIENT_ID.getName(),
+ sc -> Mockito.when(sc.getSessionID()).thenReturn("123"),
+ sc -> Mockito.when(sc.getSessionID()).thenReturn("456"),
+ MOCK_CLIENT_ID);
+ }
+
+ @Test
+ public void testFilterByLocalAddress() {
+ ActiveMQServer server = Mockito.mock(ActiveMQServer.class);
+
+ createMockSessionInServer(server, "123", false);
+ createMockSessionInServer(server, "456", true);
+
+ testFilter(server,
+ ConsumerField.LOCAL_ADDRESS.getName(),
+ sc -> Mockito.when(sc.getSessionID()).thenReturn("123"),
+ sc -> Mockito.when(sc.getSessionID()).thenReturn("456"),
+ MOCK_LOCAL_ADDRESS);
+ }
+
+ @Test
+ public void testFilterByRemoteAddress() {
+ ActiveMQServer server = Mockito.mock(ActiveMQServer.class);
+
+ createMockSessionInServer(server, "123", false);
+ createMockSessionInServer(server, "456", true);
+
+ testFilter(server,
+ ConsumerField.REMOTE_ADDRESS.getName(),
+ sc -> Mockito.when(sc.getSessionID()).thenReturn("123"),
+ sc -> Mockito.when(sc.getSessionID()).thenReturn("456"),
+ MOCK_REMOTE_ADDRESS);
+ }
+
+ @Test
+ public void testFilterByMessagesInTransit() {
+ testFilter(Mockito.mock(ActiveMQServer.class),
+ ConsumerField.MESSAGES_IN_TRANSIT.getName(),
+ sc -> Mockito.when(sc.getMessagesInTransit()).thenReturn(123),
+ sc -> Mockito.when(sc.getMessagesInTransit()).thenReturn(456),
+ "123");
+ }
+
+ @Test
+ public void testFilterByMessagesInTransitSize() {
+ testFilter(Mockito.mock(ActiveMQServer.class),
+ ConsumerField.MESSAGES_IN_TRANSIT_SIZE.getName(),
+ sc -> Mockito.when(sc.getMessagesInTransitSize()).thenReturn(123L),
+ sc -> Mockito.when(sc.getMessagesInTransitSize()).thenReturn(456L),
+ "123");
+ }
+
+ @Test
+ public void testFilterByMessagesDelivered() {
+ testFilter(Mockito.mock(ActiveMQServer.class),
+ ConsumerField.MESSAGES_DELIVERED.getName(),
+ sc -> Mockito.when(sc.getMessagesDelivered()).thenReturn(123L),
+ sc -> Mockito.when(sc.getMessagesDelivered()).thenReturn(456L),
+ "123");
+ }
+
+ @Test
+ public void testFilterByMessagesDeliveredSize() {
+ testFilter(Mockito.mock(ActiveMQServer.class),
+ ConsumerField.MESSAGES_DELIVERED_SIZE.getName(),
+ sc -> Mockito.when(sc.getMessagesDeliveredSize()).thenReturn(123L),
+ sc -> Mockito.when(sc.getMessagesDeliveredSize()).thenReturn(456L),
+ "123");
+ }
+
+ @Test
+ public void testFilterByMessagesAcknowledged() {
+ testFilter(Mockito.mock(ActiveMQServer.class),
+ ConsumerField.MESSAGES_ACKNOWLEDGED.getName(),
+ sc -> Mockito.when(sc.getMessagesAcknowledged()).thenReturn(123L),
+ sc -> Mockito.when(sc.getMessagesAcknowledged()).thenReturn(456L),
+ "123");
+ }
+
+ @Test
+ public void testFilterByMessagesAcknowledgedAwaitingCommit() {
+ testFilter(Mockito.mock(ActiveMQServer.class),
+ ConsumerField.MESSAGES_ACKNOWLEDGED_AWAITING_COMMIT.getName(),
+ sc -> Mockito.when(sc.getMessagesAcknowledgedAwaitingCommit()).thenReturn(123),
+ sc -> Mockito.when(sc.getMessagesAcknowledgedAwaitingCommit()).thenReturn(456),
+ "123");
+ }
+
+ @Test
+ public void testFilterByLastAcknowledgedTime() {
+ testFilter(Mockito.mock(ActiveMQServer.class),
+ ConsumerField.LAST_ACKNOWLEDGED_TIME.getName(),
+ sc -> Mockito.when(sc.getLastAcknowledgedTime()).thenReturn(123L),
+ sc -> Mockito.when(sc.getLastAcknowledgedTime()).thenReturn(456L),
+ "123");
+ }
+
+ @Test
+ public void testFilterByLastDeliveredTime() {
+ testFilter(Mockito.mock(ActiveMQServer.class),
+ ConsumerField.LAST_DELIVERED_TIME.getName(),
+ sc -> Mockito.when(sc.getLastDeliveredTime()).thenReturn(123L),
+ sc -> Mockito.when(sc.getLastDeliveredTime()).thenReturn(456L),
+ "123");
+ }
+
+ private void testFilter(ActiveMQServer server, String fieldName, java.util.function.Consumer<ServerConsumer> mockMatchingConsumer, java.util.function.Consumer<ServerConsumer> mockNonMatchingConsumer, String match) {
+ Collection<ServerConsumer> consumers = new ArrayList<>();
+
+ ServerConsumer matchingConsumer = Mockito.mock(ServerConsumerImpl.class);
+ mockMatchingConsumer.accept(matchingConsumer);
+ consumers.add(matchingConsumer);
+
+ ServerConsumer nonMatchingConsumer = Mockito.mock(ServerConsumerImpl.class);
+ mockNonMatchingConsumer.accept(nonMatchingConsumer);
+ consumers.add(nonMatchingConsumer);
+
+ ConsumerView consumerView = new ConsumerView(server);
+ consumerView.setOptions(createJsonFilter(fieldName, "EQUALS", match));
+ consumerView.setCollection(consumers);
+ assertEquals(1, JsonUtil.readJsonObject(consumerView.getResultsAsJson(-1, -1)).getInt("count"));
+
+ // test again with no options to verify both sessions are returned
+ consumerView = new ConsumerView(server);
+ consumerView.setOptions("");
+ consumerView.setCollection(consumers);
+ assertEquals(2, JsonUtil.readJsonObject(consumerView.getResultsAsJson(-1, -1)).getInt("count"));
+ }
+
+ /**
+ * Creates and configures the behavior of the mock objects to simulate a {@code ServerSession} managed by the
+ * {@code ActiveMQServer}.
+ * <p>
+ * This method consolidates all the code for the mock objects so that it's not spread out and duplicated in the
+ * individual tests.
+ *
+ * @param server The ActiveMQServer instance where the session should be mocked.
+ * @param sessionId The identifier of the session to be mocked.
+ * @param useRandomValues Indicates whether random values should be used for the mocked attributes.
+ */
+ private void createMockSessionInServer(ActiveMQServer server, String sessionId, boolean useRandomValues) {
+ ServerSession session = Mockito.mock(ServerSession.class);
+ RemotingConnection remotingConnection = Mockito.mock(RemotingConnection.class);
+ Connection transportConnection = Mockito.mock(Connection.class);
+
+ Mockito.when(server.getSessionByID(sessionId)).thenReturn(session);
+
+ Mockito.when(session.getValidatedUser()).thenReturn(useRandomValues ? RandomUtil.randomUUIDString() : MOCK_VALIDATED_USER);
+ Mockito.when(session.getUsername()).thenReturn(useRandomValues ? RandomUtil.randomUUIDString() : MOCK_USER);
+ Mockito.when(session.getRemotingConnection()).thenReturn(remotingConnection);
+
+ Mockito.when(remotingConnection.getProtocolName()).thenReturn(useRandomValues ? RandomUtil.randomUUIDString() : MOCK_PROTOCOL);
+ Mockito.when(remotingConnection.getClientID()).thenReturn(useRandomValues ? RandomUtil.randomUUIDString() : MOCK_CLIENT_ID);
+ Mockito.when(remotingConnection.getTransportConnection()).thenReturn(transportConnection);
+
+ Mockito.when(transportConnection.getLocalAddress()).thenReturn(useRandomValues ? RandomUtil.randomUUIDString() : MOCK_LOCAL_ADDRESS);
+ Mockito.when(transportConnection.getRemoteAddress()).thenReturn(useRandomValues ? RandomUtil.randomUUIDString() : MOCK_REMOTE_ADDRESS);
+ }
+}
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/ProducerViewTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/ProducerViewTest.java
new file mode 100644
index 0000000000..2793422106
--- /dev/null
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/ProducerViewTest.java
@@ -0,0 +1,49 @@
+/*
+ * 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.management.impl.view;
+
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+public class ProducerViewTest extends ViewTest {
+
+ @Test
+ public void testDefaultViewNullOptions() {
+ ProducerView producerView = new ProducerView(Mockito.mock(ActiveMQServer.class));
+ // sanity check to ensure this doesn't just blow up
+ producerView.setOptions(null);
+ }
+
+ @Test
+ public void testDefaultViewEmptyOptions() {
+ ProducerView producerView = new ProducerView(Mockito.mock(ActiveMQServer.class));
+ // sanity check to ensure this doesn't just blow up
+ producerView.setOptions("");
+ }
+
+ @Test
+ public void testViewLegacySort() {
+ ProducerView view = new ProducerView(Mockito.mock(ActiveMQServer.class));
+ assertNotEquals("user", view.getDefaultOrderColumn());
+ view.setOptions(createLegacyJsonFilter("user", "EQUALS", "123", "user", "asc"));
+ assertEquals("user", view.getSortField());
+ }
+}
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/QueueViewTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/QueueViewTest.java
new file mode 100644
index 0000000000..d9fb3ae00c
--- /dev/null
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/QueueViewTest.java
@@ -0,0 +1,49 @@
+/*
+ * 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.management.impl.view;
+
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+public class QueueViewTest extends ViewTest {
+
+ @Test
+ public void testDefaultQueueViewNullOptions() {
+ QueueView queueView = new QueueView(Mockito.mock(ActiveMQServer.class));
+ // sanity check to ensure this doesn't just blow up
+ queueView.setOptions(null);
+ }
+
+ @Test
+ public void testDefaultQueueViewEmptyOptions() {
+ QueueView queueView = new QueueView(Mockito.mock(ActiveMQServer.class));
+ // sanity check to ensure this doesn't just blow up
+ queueView.setOptions("");
+ }
+
+ @Test
+ public void testQueueViewLegacySort() {
+ QueueView view = new QueueView(Mockito.mock(ActiveMQServer.class));
+ assertNotEquals("id", view.getDefaultOrderColumn());
+ view.setOptions(createLegacyJsonFilter("id", "EQUALS", "123", "id", "asc"));
+ assertEquals("id", view.getSortField());
+ }
+}
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/SessionViewTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/SessionViewTest.java
new file mode 100644
index 0000000000..9300aeae50
--- /dev/null
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/SessionViewTest.java
@@ -0,0 +1,47 @@
+/*
+ * 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.management.impl.view;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+public class SessionViewTest extends ViewTest {
+
+ @Test
+ public void testDefaultSessionViewNullOptions() {
+ SessionView sessionView = new SessionView();
+ // sanity check to ensure this doesn't just blow up
+ sessionView.setOptions(null);
+ }
+
+ @Test
+ public void testDefaultSessionViewEmptyOptions() {
+ SessionView sessionView = new SessionView();
+ // sanity check to ensure this doesn't just blow up
+ sessionView.setOptions("");
+ }
+
+ @Test
+ public void testSessionViewLegacySort() {
+ SessionView view = new SessionView();
+ assertNotEquals("user", view.getDefaultOrderColumn());
+ view.setOptions(createLegacyJsonFilter("user", "EQUALS", "123", "user", "asc"));
+ assertEquals("user", view.getSortField());
+ }
+}
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/ViewTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/ViewTest.java
index 032e9fc385..bd3ec83692 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/ViewTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/ViewTest.java
@@ -17,150 +17,19 @@
package org.apache.activemq.artemis.core.management.impl.view;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
-import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.api.core.JsonUtil;
+import org.apache.activemq.artemis.json.JsonObject;
import org.apache.activemq.artemis.json.JsonObjectBuilder;
import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
public class ViewTest {
- @Test
- public void testDefaultConnectionViewNullOptions() {
- ConnectionView connectionView = new ConnectionView(Mockito.mock(ActiveMQServer.class));
- // sanity check to ensure this doesn't just blow up
- connectionView.setOptions(null);
- }
-
- @Test
- public void testDefaultConnectionViewEmptyOptions() {
- ConnectionView connectionView = new ConnectionView(Mockito.mock(ActiveMQServer.class));
- // sanity check to ensure this doesn't just blow up
- connectionView.setOptions("");
- }
-
- @Test
- public void testConnectionViewLegacySort() {
- ConnectionView connectionView = new ConnectionView(Mockito.mock(ActiveMQServer.class));
- assertNotEquals("protocol", connectionView.getDefaultOrderColumn());
- connectionView.setOptions("{\"field\":\"protocol\",\"operation\":\"EQUALS\",\"value\":\"CORE\",\"sortColumn\":\"protocol\",\"sortOrder\":\"asc\"}");
- assertEquals("protocol", connectionView.getSortField());
- }
-
- @Test
- public void testDefaultSessionViewNullOptions() {
- SessionView sessionView = new SessionView();
- // sanity check to ensure this doesn't just blow up
- sessionView.setOptions(null);
- }
-
- @Test
- public void testDefaultSessionViewEmptyOptions() {
- SessionView sessionView = new SessionView();
- // sanity check to ensure this doesn't just blow up
- sessionView.setOptions("");
- }
-
- @Test
- public void testSessionViewLegacySort() {
- SessionView sessionView = new SessionView();
- assertNotEquals("user", sessionView.getDefaultOrderColumn());
- sessionView.setOptions("{\"field\":\"user\",\"operation\":\"EQUALS\",\"value\":\"123\",\"sortColumn\":\"user\",\"sortOrder\":\"asc\"}");
- assertEquals("user", sessionView.getSortField());
- }
-
- @Test
- public void testDefaultAddressViewNullOptions() {
- AddressView addressView = new AddressView(Mockito.mock(ActiveMQServer.class));
- // sanity check to ensure this doesn't just blow up
- addressView.setOptions(null);
- }
-
- @Test
- public void testDefaultAddressViewEmptyOptions() {
- AddressView addressView = new AddressView(Mockito.mock(ActiveMQServer.class));
- // sanity check to ensure this doesn't just blow up
- addressView.setOptions("");
- }
-
- @Test
- public void testAddressViewLegacySort() {
- AddressView addressView = new AddressView(Mockito.mock(ActiveMQServer.class));
- assertNotEquals("name", addressView.getDefaultOrderColumn());
- addressView.setOptions("{\"field\":\"name\",\"operation\":\"EQUALS\",\"value\":\"123\",\"sortColumn\":\"name\",\"sortOrder\":\"asc\"}");
- assertEquals("name", addressView.getSortField());
- }
-
- @Test
- public void testDefaultQueueViewNullOptions() {
- QueueView queueView = new QueueView(Mockito.mock(ActiveMQServer.class));
- // sanity check to ensure this doesn't just blow up
- queueView.setOptions(null);
- }
-
- @Test
- public void testDefaultQueueViewEmptyOptions() {
- QueueView queueView = new QueueView(Mockito.mock(ActiveMQServer.class));
- // sanity check to ensure this doesn't just blow up
- queueView.setOptions("");
- }
-
- @Test
- public void testQueueViewLegacySort() {
- QueueView view = new QueueView(Mockito.mock(ActiveMQServer.class));
- assertNotEquals("id", view.getDefaultOrderColumn());
- view.setOptions("{\"field\":\"id\",\"operation\":\"EQUALS\",\"value\":\"123\",\"sortColumn\":\"id\",\"sortOrder\":\"asc\"}");
- assertEquals("id", view.getSortField());
- }
-
- @Test
- public void testDefaultConsumerViewNullOptions() {
- ConsumerView consumerView = new ConsumerView(Mockito.mock(ActiveMQServer.class));
- // sanity check to ensure this doesn't just blow up
- consumerView.setOptions(null);
- }
-
- @Test
- public void testDefaultConsumerViewEmptyOptions() {
- ConsumerView consumerView = new ConsumerView(Mockito.mock(ActiveMQServer.class));
- // sanity check to ensure this doesn't just blow up
- consumerView.setOptions("");
- }
-
- @Test
- public void testConsumerViewLegacySort() {
- ConsumerView view = new ConsumerView(Mockito.mock(ActiveMQServer.class));
- assertNotEquals("user", view.getDefaultOrderColumn());
- view.setOptions("{\"field\":\"user\",\"operation\":\"EQUALS\",\"value\":\"123\",\"sortColumn\":\"user\",\"sortOrder\":\"asc\"}");
- assertEquals("user", view.getSortField());
- }
-
- @Test
- public void testDefaultProducerViewNullOptions() {
- ProducerView producerView = new ProducerView(Mockito.mock(ActiveMQServer.class));
- // sanity check to ensure this doesn't just blow up
- producerView.setOptions(null);
- }
-
- @Test
- public void testDefaultProducerViewEmptyOptions() {
- ProducerView producerView = new ProducerView(Mockito.mock(ActiveMQServer.class));
- // sanity check to ensure this doesn't just blow up
- producerView.setOptions("");
- }
-
- @Test
- public void testProducerViewLegacySort() {
- ProducerView view = new ProducerView(Mockito.mock(ActiveMQServer.class));
- assertNotEquals("user", view.getDefaultOrderColumn());
- view.setOptions("{\"field\":\"user\",\"operation\":\"EQUALS\",\"value\":\"123\",\"sortColumn\":\"user\",\"sortOrder\":\"asc\"}");
- assertEquals("user", view.getSortField());
- }
-
@Test
public void testPageSizeAndPageNumber() {
ActiveMQAbstractView myView = new ActiveMQAbstractView() {
@@ -209,4 +78,25 @@ public class ViewTest {
// past the last page
assertEquals(0, myView.getPagedResult(11, 100).size());
}
+
+ protected String createJsonFilter(String fieldName, String operationName, String value) {
+ Map<String, Object> filterMap = new HashMap<>();
+ filterMap.put("field", fieldName);
+ filterMap.put("operation", operationName);
+ filterMap.put("value", value);
+ JsonObject jsonFilterObject = JsonUtil.toJsonObject(filterMap);
+ return jsonFilterObject.toString();
+ }
+
+ protected String createLegacyJsonFilter(String fieldName, String operationName, String value, String sortColumn, String sortOrder) {
+ Map<String, Object> filterMap = new HashMap<>();
+ filterMap.put("field", fieldName);
+ filterMap.put("operation", operationName);
+ filterMap.put("value", value);
+ // in newer versions this is "sortField"
+ filterMap.put("sortColumn", sortColumn);
+ filterMap.put("sortOrder", sortOrder);
+ JsonObject jsonFilterObject = JsonUtil.toJsonObject(filterMap);
+ return jsonFilterObject.toString();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@artemis.apache.org
For additional commands, e-mail: commits-help@artemis.apache.org
(artemis) 02/02: ARTEMIS-5854 add integration tests
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tabish pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/artemis.git
commit d657f960c0362a14546ea38f8e653572ceb2b6e3
Author: Andy Taylor <an...@gmail.com>
AuthorDate: Tue Jan 27 14:38:49 2026 +0000
ARTEMIS-5854 add integration tests
---
.../management/ActiveMQServerControlTest.java | 69 ++++++++++++++++++++++
1 file changed, 69 insertions(+)
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
index db8f9e9cd8..6abdf31631 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
@@ -134,6 +134,7 @@ import org.apache.activemq.artemis.tests.extensions.parameterized.Parameters;
import org.apache.activemq.artemis.tests.unit.core.config.impl.fakes.FakeConnectorServiceFactory;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.tests.util.Wait;
+import org.apache.activemq.artemis.utils.JsonLoader;
import org.apache.activemq.artemis.utils.RandomUtil;
import org.apache.activemq.artemis.utils.SecurityFormatter;
import org.apache.activemq.artemis.utils.UUIDGenerator;
@@ -4442,6 +4443,74 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
}
+ @TestTemplate
+ public void testListConsumersLastAckTime() throws Exception {
+ testListConsumersTime(ConsumerField.LAST_ACKNOWLEDGED_TIME.getName());
+ }
+
+ @TestTemplate
+ public void testListConsumersLastDeliveredTime() throws Exception {
+ testListConsumersTime(ConsumerField.LAST_DELIVERED_TIME.getName());
+ }
+
+ private void testListConsumersTime(String field) throws Exception {
+ SimpleString queueName = SimpleString.of(getName());
+
+ ActiveMQServerControl serverControl = createManagementControl();
+
+ Queue queue;
+ if (legacyCreateQueue) {
+ queue = server.createQueue(queueName, RoutingType.ANYCAST, queueName, null, false, false);
+ } else {
+ queue = server.createQueue(QueueConfiguration.of(queueName).setAddress(queueName).setRoutingType(RoutingType.ANYCAST).setDurable(false));
+ }
+
+ try (ServerLocator locator = createInVMNonHALocator();
+ ClientSessionFactory csf = createSessionFactory(locator);
+ ClientSession session = csf.createSession()) {
+
+ ClientConsumer consumer1 = session.createConsumer(queueName);
+ ClientConsumer consumer2 = session.createConsumer(queueName);
+ ClientConsumer consumer3 = session.createConsumer(queueName);
+ session.start();
+ ClientProducer producer = session.createProducer(queueName);
+ producer.send(session.createMessage(true));
+ ClientMessage message = consumer1.receiveImmediate();
+ assertNotNull(message);
+ message.individualAcknowledge();
+ Thread.sleep(3);
+ producer.send(session.createMessage(true));
+ message = consumer2.receiveImmediate();
+ assertNotNull(message);
+ message.individualAcknowledge();
+ Wait.assertEquals(2L, () -> queue.getMessagesAcknowledged(), 1000, 20);
+
+ JsonArray array = (JsonArray) JsonUtil.readJsonObject(serverControl.listConsumers(null, -1, -1)).get("data");
+ long time1 = array.getJsonObject(0).getJsonNumber(field).longValue();
+ long time2 = array.getJsonObject(1).getJsonNumber(field).longValue();
+ long time3 = array.getJsonObject(2).getJsonNumber(field).longValue();
+
+ verifyConsumerCount(serverControl, createJsonFilter(field, "EQUALS", String.valueOf(time1)), queueName, 1);
+ verifyConsumerCount(serverControl, createJsonFilter(field, "EQUALS", String.valueOf(time2)), queueName, 1);
+ verifyConsumerCount(serverControl, createJsonFilter(field, "EQUALS", String.valueOf(time3)), queueName, 1);
+ verifyConsumerCount(serverControl, createJsonFilter(field, "GREATER_THAN", "0"), queueName, 2);
+ verifyConsumerCount(serverControl, createJsonFilter(field, "LESS_THAN", "1"), queueName, 1);
+ }
+ }
+
+ private static void verifyConsumerCount(ActiveMQServerControl serverControl, String filterString, SimpleString expectedQueueName, int expectedConsumerCount) throws Exception {
+ String consumersAsJsonString = serverControl.listConsumers(filterString, -1, -1);
+ JsonArray data = (JsonArray) JsonUtil.readJsonObject(consumersAsJsonString).get("data");
+ int consumerCount = 0;
+ for (int i = 0; i < data.size(); i++) {
+ String consumerQueueName = data.getJsonObject(i).getString(ConsumerField.QUEUE.getName());
+ if (consumerQueueName != null && consumerQueueName.equals(expectedQueueName.toString())) {
+ consumerCount++;
+ }
+ }
+ assertEquals(expectedConsumerCount, consumerCount, "number of consumers returned from query using filter: " + filterString + "\n" + JsonLoader.prettyPrint(consumersAsJsonString));
+ }
+
@TestTemplate
public void testListConsumersOrder() throws Exception {
SimpleString queueName1 = SimpleString.of("my_queue_one");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@artemis.apache.org
For additional commands, e-mail: commits-help@artemis.apache.org