Repository: activemq-artemis Updated Branches: refs/heads/master 2180dc3b9 -> f06db19ea
ARTEMIS-1688 Fixing test after new addresses included Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f06db19e Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f06db19e Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f06db19e Branch: refs/heads/master Commit: f06db19eab0ecd83fc6dc896d8b4c0d89c55c71f Parents: 2180dc3 Author: Clebert Suconic <[email protected]> Authored: Wed Feb 21 09:43:10 2018 -0500 Committer: Clebert Suconic <[email protected]> Committed: Wed Feb 21 09:43:10 2018 -0500 ---------------------------------------------------------------------- .../integration/plugin/CorePluginTest.java | 23 +++++++++++--------- 1 file changed, 13 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f06db19e/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/CorePluginTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/CorePluginTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/CorePluginTest.java index abac09c..6545f70 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/CorePluginTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/CorePluginTest.java @@ -131,12 +131,8 @@ public class CorePluginTest extends JMSTestBase { verifier.validatePluginMethodsEquals(0, MESSAGE_EXPIRED, BEFORE_DEPLOY_BRIDGE, AFTER_DEPLOY_BRIDGE, BEFORE_DESTROY_QUEUE, AFTER_DESTROY_QUEUE, BEFORE_UPDATE_ADDRESS, AFTER_UPDATE_ADDRESS, BEFORE_REMOVE_ADDRESS, AFTER_REMOVE_ADDRESS, BEFORE_REMOVE_BINDING, AFTER_REMOVE_BINDING); - verifier.validatePluginMethodsEquals(1, AFTER_CREATE_CONNECTION, AFTER_DESTROY_CONNECTION, - BEFORE_CREATE_CONSUMER, AFTER_CREATE_CONSUMER, BEFORE_CLOSE_CONSUMER, AFTER_CLOSE_CONSUMER, - BEFORE_CREATE_QUEUE, AFTER_CREATE_QUEUE, BEFORE_ADD_BINDING, AFTER_ADD_BINDING, MESSAGE_ACKED, BEFORE_SEND, - AFTER_SEND, BEFORE_ADD_ADDRESS, AFTER_ADD_ADDRESS); verifier.validatePluginMethodsEquals(2, BEFORE_CREATE_SESSION, AFTER_CREATE_SESSION, BEFORE_CLOSE_SESSION, - AFTER_CLOSE_SESSION); + AFTER_CLOSE_SESSION, BEFORE_ADD_ADDRESS, AFTER_ADD_ADDRESS); verifier.validatePluginMethodsAtLeast(1, BEFORE_MESSAGE_ROUTE, AFTER_MESSAGE_ROUTE); @@ -155,8 +151,9 @@ public class CorePluginTest extends JMSTestBase { server.destroyQueue(new SimpleString(queue.getQueueName())); + verifier.validatePluginMethodsEquals(2, BEFORE_ADD_ADDRESS, AFTER_ADD_ADDRESS); verifier.validatePluginMethodsEquals(1, BEFORE_CREATE_QUEUE, AFTER_CREATE_QUEUE, BEFORE_DESTROY_QUEUE, - AFTER_DESTROY_QUEUE, BEFORE_ADD_ADDRESS, AFTER_ADD_ADDRESS, BEFORE_REMOVE_BINDING, AFTER_REMOVE_BINDING); + AFTER_DESTROY_QUEUE, BEFORE_REMOVE_BINDING, AFTER_REMOVE_BINDING); } @Test @@ -171,8 +168,11 @@ public class CorePluginTest extends JMSTestBase { verifier.validatePluginMethodsEquals(1, BEFORE_DESTROY_QUEUE, AFTER_DESTROY_QUEUE, BEFORE_REMOVE_ADDRESS, AFTER_REMOVE_ADDRESS); - verifier.validatePluginMethodsEquals(2, BEFORE_CREATE_QUEUE, AFTER_CREATE_QUEUE, BEFORE_ADD_ADDRESS, - AFTER_ADD_ADDRESS, BEFORE_ADD_BINDING, AFTER_ADD_BINDING); + verifier.validatePluginMethodsEquals(3, BEFORE_ADD_ADDRESS, + AFTER_ADD_ADDRESS); + + verifier.validatePluginMethodsEquals(2, BEFORE_CREATE_QUEUE, AFTER_CREATE_QUEUE, + BEFORE_ADD_BINDING, AFTER_ADD_BINDING); } @Test @@ -190,8 +190,11 @@ public class CorePluginTest extends JMSTestBase { //Before/Add address are called twice because of the autocreated destination and the //created destination in the before method - verifier.validatePluginMethodsEquals(2, BEFORE_CREATE_QUEUE, AFTER_CREATE_QUEUE, BEFORE_ADD_ADDRESS, - AFTER_ADD_ADDRESS, BEFORE_ADD_BINDING, AFTER_ADD_BINDING); + verifier.validatePluginMethodsEquals(3, BEFORE_ADD_ADDRESS, + AFTER_ADD_ADDRESS); + + verifier.validatePluginMethodsEquals(2, BEFORE_CREATE_QUEUE, AFTER_CREATE_QUEUE, + BEFORE_ADD_BINDING, AFTER_ADD_BINDING); } @Test
