QPID-2097: Enable MALT and update it to fix breakages while it was disabled. Enable the excluded PFC JMX test in the InVM profile now that InVM JMX is available.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@935929 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 18 insertions, 15 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java b/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java
index 51076fe358..791330178c 100644
--- a/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java
@@ -44,6 +44,7 @@ import java.util.concurrent.TimeUnit;
 public class ManagementActorLoggingTest extends AbstractTestLogging
 {
     private JMXTestUtils _jmxUtils;
+    private boolean _closed = false;
     private static final String USER = "admin";
 
     @Override
@@ -52,12 +53,16 @@ public class ManagementActorLoggingTest extends AbstractTestLogging
         _jmxUtils = new JMXTestUtils(this, USER, USER);
         _jmxUtils.setUp();
         super.setUp();
+        _jmxUtils.open();
     }
 
     @Override
     public void tearDown() throws Exception
     {
-        _jmxUtils.close();
+        if(!_closed)
+        {
+            _jmxUtils.close();
+        }
         super.tearDown();
     }
 
@@ -106,7 +111,8 @@ public class ManagementActorLoggingTest extends AbstractTestLogging
         assertEquals("Unexpected Management Connection close count", 0, results.size());
 
         _jmxUtils.close();
-
+        _closed  = true;
+        
         results = _monitor.waitAndFindMatches("MNG-1008", DEFAULT_LOG_WAIT);
 
         assertEquals("Unexpected Management Connection count", 1, results.size());
@@ -198,7 +204,7 @@ public class ManagementActorLoggingTest extends AbstractTestLogging
     {
         _monitor.reset();
 
-        _jmxUtils.createExchange("test", "direct", null, false);
+        _jmxUtils.createExchange("test", getName(), "direct", false);
 
         // Validate
 
@@ -222,7 +228,7 @@ public class ManagementActorLoggingTest extends AbstractTestLogging
         //Remove any previous exchange declares
         _monitor.reset();
 
-        _jmxUtils.createExchange("test", "topic", null, false);
+        _jmxUtils.createExchange("test", getName(), "topic", false);
 
         // Validate
 
@@ -247,7 +253,7 @@ public class ManagementActorLoggingTest extends AbstractTestLogging
         //Remove any previous exchange declares
         _monitor.reset();
 
-        _jmxUtils.createExchange("test", "fanout", null, false);
+        _jmxUtils.createExchange("test", getName(), "fanout", false);
 
         // Validate
 
@@ -272,7 +278,7 @@ public class ManagementActorLoggingTest extends AbstractTestLogging
         //Remove any previous exchange declares
         _monitor.reset();
 
-        _jmxUtils.createExchange("test", "headers", null, false);
+        _jmxUtils.createExchange("test", getName(), "headers", false);
 
         // Validate
 
@@ -474,7 +480,7 @@ public class ManagementActorLoggingTest extends AbstractTestLogging
         // Validate correct binding
         String subject = fromSubject(log);
         assertEquals("Incorrect queue named in create", getName(), AbstractTestLogSubject.getSlice("qu", subject));
-        assertEquals("Incorrect routing key in create", "*", AbstractTestLogSubject.getSlice("rk", subject));
+        assertEquals("Incorrect routing key in create", getName(), AbstractTestLogSubject.getSlice("rk", subject));
 
         // Validate it was a management actor.
         String actor = fromActor(log);
@@ -506,7 +512,7 @@ public class ManagementActorLoggingTest extends AbstractTestLogging
         //Remove any previous queue declares
         _monitor.reset();
 
-        _jmxUtils.createExchange("test", "direct", null, false);
+        _jmxUtils.createExchange("test", getName(), "direct", false);
 
         ManagedBroker managedBroker = _jmxUtils.getManagedBroker("test");
 
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java b/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
index ca59a0536b..9b786a5c62 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
@@ -70,7 +70,10 @@ public class JMXTestUtils
 
     public void close() throws IOException
     {
-        _jmxc.close();
+        if(_jmxc != null)
+        {
+            _jmxc.close();
+        }
     }
 
     /**
diff --git a/java/test-profiles/JavaExcludes b/java/test-profiles/JavaExcludes
index 99d354e316..1ab9c51926 100644
--- a/java/test-profiles/JavaExcludes
+++ b/java/test-profiles/JavaExcludes
@@ -13,9 +13,6 @@ org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#*
 // QPID-1823: this takes ages to run
 org.apache.qpid.client.SessionCreateTest#*
 
-// QPID-2097 exclude it from the InVM test runs until InVM JMX Interface is reliable
-org.apache.qpid.management.jmx.ManagementActorLoggingTest#*
-
 // related to QPID-2471. Temporarily disabling these tests until I figure out why they are failing with the Java broker.
 org.apache.qpid.test.unit.ack.RecoverTest#testRecoverResendsMsgs
 org.apache.qpid.test.unit.ack.RecoverTest#testRecoverResendsMsgsAckOnEarlier
diff --git a/java/test-profiles/JavaInVMExcludes b/java/test-profiles/JavaInVMExcludes
index ff1da93230..d66abad843 100644
--- a/java/test-profiles/JavaInVMExcludes
+++ b/java/test-profiles/JavaInVMExcludes
@@ -2,9 +2,6 @@
 //Exclude the following tests when running the InVM default test profile
 //======================================================================
 
-// QPID-2097 exclude until InVM JMX test runs are reliable
-org.apache.qpid.server.queue.ProducerFlowControlTest#testFlowControlAttributeModificationViaJMX
-
 // This test requires a broker capable of 0-8/9 and 0-10
 org.apache.qpid.test.client.message.JMSDestinationTest#testReceiveResend