You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2010/04/20 16:04:13 UTC
svn commit: r935929 - in /qpid/trunk/qpid/java:
systests/src/main/java/org/apache/qpid/management/jmx/
systests/src/main/java/org/apache/qpid/test/utils/ test-profiles/
Author: robbie
Date: Tue Apr 20 14:04:13 2010
New Revision: 935929
URL: http://svn.apache.org/viewvc?rev=935929&view=rev
Log:
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.
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
qpid/trunk/qpid/java/test-profiles/JavaExcludes
qpid/trunk/qpid/java/test-profiles/JavaInVMExcludes
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java?rev=935929&r1=935928&r2=935929&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java Tue Apr 20 14:04:13 2010
@@ -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
_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
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
{
_monitor.reset();
- _jmxUtils.createExchange("test", "direct", null, false);
+ _jmxUtils.createExchange("test", getName(), "direct", false);
// Validate
@@ -222,7 +228,7 @@ public class ManagementActorLoggingTest
//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
//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
//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
// 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
//Remove any previous queue declares
_monitor.reset();
- _jmxUtils.createExchange("test", "direct", null, false);
+ _jmxUtils.createExchange("test", getName(), "direct", false);
ManagedBroker managedBroker = _jmxUtils.getManagedBroker("test");
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java?rev=935929&r1=935928&r2=935929&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java Tue Apr 20 14:04:13 2010
@@ -70,7 +70,10 @@ public class JMXTestUtils
public void close() throws IOException
{
- _jmxc.close();
+ if(_jmxc != null)
+ {
+ _jmxc.close();
+ }
}
/**
Modified: qpid/trunk/qpid/java/test-profiles/JavaExcludes
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/JavaExcludes?rev=935929&r1=935928&r2=935929&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/JavaExcludes (original)
+++ qpid/trunk/qpid/java/test-profiles/JavaExcludes Tue Apr 20 14:04:13 2010
@@ -13,9 +13,6 @@ org.apache.qpid.server.persistent.NoLoca
// 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
Modified: qpid/trunk/qpid/java/test-profiles/JavaInVMExcludes
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/JavaInVMExcludes?rev=935929&r1=935928&r2=935929&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/JavaInVMExcludes (original)
+++ qpid/trunk/qpid/java/test-profiles/JavaInVMExcludes Tue Apr 20 14:04:13 2010
@@ -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
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org