Author: grkvlt
Date: Mon Mar 7 16:58:13 2011
New Revision: 1078852
URL: http://svn.apache.org/viewvc?rev=1078852&view=rev
Log:
QPID-3111: Check for 404 error code explicitly in DynamicQueueExchangeCreateTest
Modified:
qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/Java010Excludes
Modified:
qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java?rev=1078852&r1=1078851&r2=1078852&view=diff
==============================================================================
---
qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
(original)
+++
qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
Mon Mar 7 16:58:13 2011
@@ -20,6 +20,8 @@
*/
package org.apache.qpid.test.unit.client;
+import org.apache.qpid.AMQException;
+import org.apache.qpid.protocol.AMQConstant;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
import javax.jms.Connection;
@@ -32,11 +34,9 @@ import javax.jms.Session;
*
* Test to validate that setting the respective qpid.declare_queues,
* qpid.declare_exchanges system properties functions as expected.
- *
*/
public class DynamicQueueExchangeCreateTest extends QpidBrokerTestCase
{
-
public void testQueueDeclare() throws Exception
{
setSystemProperty("qpid.declare_queues", "false");
@@ -53,11 +53,8 @@ public class DynamicQueueExchangeCreateT
fail("JMSException should be thrown as the queue does not exist");
}
catch (JMSException e)
- {
- assertTrue("Exception should be that the queue does not exist :" +
- e.getMessage(),
- e.getMessage().contains("does not exist"));
-
+ {
+ checkExceptionErrorCode(e, AMQConstant.NOT_FOUND);
}
}
@@ -79,10 +76,15 @@ public class DynamicQueueExchangeCreateT
}
catch (JMSException e)
{
- assertTrue("Exception should be that the exchange does not exist
:" +
- e.getMessage(),
- e.getMessage().contains("Exchange " + EXCHANGE_TYPE + "
does not exist"));
+ checkExceptionErrorCode(e, AMQConstant.NOT_FOUND);
}
}
+ private void checkExceptionErrorCode(JMSException original, AMQConstant
code)
+ {
+ Exception linked = original.getLinkedException();
+ assertNotNull("Linked exception should have been set", linked);
+ assertTrue("Linked exception should be an AMQException", linked
instanceof AMQException);
+ assertEquals("Error code should be " + code.getCode(), code,
((AMQException) linked).getErrorCode());
+ }
}
Modified:
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/Java010Excludes
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/Java010Excludes?rev=1078852&r1=1078851&r2=1078852&view=diff
==============================================================================
---
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/Java010Excludes
(original)
+++
qpid/branches/grkvlt-network-20110301/qpid/java/test-profiles/Java010Excludes
Mon Mar 7 16:58:13 2011
@@ -59,9 +59,6 @@ org.apache.qpid.server.queue.ModelTest#*
// 0-10 is not supported by the MethodRegistry
org.apache.qpid.test.unit.close.JavaServerCloseRaceConditionTest#*
-// QPID-2084 : this test needs more work for 0-10
-//org.apache.qpid.test.unit.client.DynamicQueueExchangeCreateTest#*
-
//QPID-942 : Implemented Channel.Flow based Producer Side flow control to the
Java Broker (not in CPP Broker)
org.apache.qpid.server.queue.ProducerFlowControlTest#*
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
