From 4974f2a9f08ab8424e6917b94c9aaf472ab50b78 Mon Sep 17 00:00:00 2001 From: Justin Bertram Date: Thu, 21 Jul 2022 10:50:46 -0500 Subject: [PATCH] ARTEMIS-3896 fix tests --- .../smoke/logging/AuditLoggerAMQPMutualSSLTest.java | 4 ++-- .../tests/smoke/logging/AuditLoggerResourceTest.java | 12 ++++++------ .../artemis/tests/smoke/logging/AuditLoggerTest.java | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerAMQPMutualSSLTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerAMQPMutualSSLTest.java index efabe44443..e35e921baa 100644 --- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerAMQPMutualSSLTest.java +++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerAMQPMutualSSLTest.java @@ -75,9 +75,9 @@ public class AuditLoggerAMQPMutualSSLTest extends AuditLoggerTestBase { checkAuditLogRecord(true, "AMQ601715: User myUser(producers)@", "successfully authenticated"); checkAuditLogRecord(true, "AMQ601267: User myUser(producers)@", "is creating a core session"); - checkAuditLogRecord(true, "AMQ601500: User myUser(producers)@", "is sending a message AMQPStandardMessage"); + checkAuditLogRecord(true, "AMQ601500: User myUser(producers)@", "sent a message AMQPStandardMessage"); checkAuditLogRecord(true, "AMQ601265: User myUser(producers)@", "is creating a core consumer"); checkAuditLogRecord(true, "AMQ601501: User myUser(producers)@", "is consuming a message from exampleQueue"); - checkAuditLogRecord(true, "AMQ601502: User myUser(producers)@", "is acknowledging a message from exampleQueue: AMQPStandardMessage"); + checkAuditLogRecord(true, "AMQ601502: User myUser(producers)@", "acknowledged message from exampleQueue: AMQPStandardMessage"); } } diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerResourceTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerResourceTest.java index 5452622fd4..d67c6b91ea 100644 --- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerResourceTest.java +++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerResourceTest.java @@ -52,19 +52,19 @@ public class AuditLoggerResourceTest extends AuditLoggerTestBase { ActiveMQServerControl serverControl = MBeanServerInvocationHandler.newProxyInstance(mBeanServerConnection, objectNameBuilder.getActiveMQServerObjectName(), ActiveMQServerControl.class, false); serverControl.createAddress("auditAddress", "ANYCAST,MULTICAST"); - checkAuditLogRecord(true, "successfully created Address:"); + checkAuditLogRecord(true, "successfully created address:"); serverControl.updateAddress("auditAddress", "ANYCAST"); - checkAuditLogRecord(true, "successfully updated Address:"); + checkAuditLogRecord(true, "successfully updated address:"); serverControl.deleteAddress("auditAddress"); - checkAuditLogRecord(true, "successfully deleted Address:"); + checkAuditLogRecord(true, "successfully deleted address:"); serverControl.createQueue("auditAddress", "auditQueue", "ANYCAST"); - checkAuditLogRecord(true, "successfully created Queue:"); + checkAuditLogRecord(true, "successfully created queue:"); serverControl.updateQueue("auditQueue", "ANYCAST", -1, false); final QueueControl queueControl = MBeanServerInvocationHandler.newProxyInstance(mBeanServerConnection, objectNameBuilder.getQueueObjectName(new SimpleString( "auditAddress"), new SimpleString("auditQueue"), RoutingType.ANYCAST), QueueControl.class, false); - checkAuditLogRecord(true, "successfully updated Queue:"); + checkAuditLogRecord(true, "successfully updated queue:"); queueControl.removeAllMessages(); checkAuditLogRecord(true, "has removed 0 messages"); queueControl.sendMessage(new HashMap<>(), 0, "foo", true, "admin", "admin"); @@ -72,7 +72,7 @@ public class AuditLoggerResourceTest extends AuditLoggerTestBase { CompositeData[] browse = queueControl.browse(); checkAuditLogRecord(true, "browsed " + browse.length + " messages"); serverControl.destroyQueue("auditQueue"); - checkAuditLogRecord(true, "successfully deleted Queue:"); + checkAuditLogRecord(true, "successfully deleted queue:"); ServerLocator locator = createNettyNonHALocator(); ClientSessionFactory sessionFactory = locator.createSessionFactory(); diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTest.java index 8321852a8a..820c2acafb 100644 --- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTest.java +++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTest.java @@ -162,7 +162,7 @@ public class AuditLoggerTest extends AuditLoggerTestBase { Assert.assertEquals(2, addressControl.getMessageCount()); checkAuditLogRecord(false, "messageID=0"); - checkAuditLogRecord(true, "sending a message"); + checkAuditLogRecord(true, "sent a message"); checkAuditLogRecord(true, uniqueStr); checkAuditLogRecord(true, "Hello2"); @@ -176,6 +176,6 @@ public class AuditLoggerTest extends AuditLoggerTestBase { connection.close(); } checkAuditLogRecord(true, "is consuming a message from"); - checkAuditLogRecord(true, "is acknowledging a message from"); + checkAuditLogRecord(true, "acknowledged message from"); } }