summaryrefslogtreecommitdiff
path: root/qpid/java/broker/src/test
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2012-02-02 14:26:16 +0000
committerRobert Godfrey <rgodfrey@apache.org>2012-02-02 14:26:16 +0000
commit140857bac37328466e17fbb57b710a2b805f60a5 (patch)
treeea611380ba0a6df88b57a077511c6f28558b4e61 /qpid/java/broker/src/test
parent172b0f7a7fd463ca81425c8e7b2ea9a9b964409d (diff)
downloadqpid-python-140857bac37328466e17fbb57b710a2b805f60a5.tar.gz
QPID-3801 : [Java] Move JMS Selector code into common
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1239643 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker/src/test')
-rw-r--r--qpid/java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java15
1 files changed, 12 insertions, 3 deletions
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java
index 3ba4f1c620..3e0e217eee 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java
@@ -23,7 +23,8 @@ package org.apache.qpid.server;
import junit.framework.TestCase;
-import org.apache.qpid.AMQException;
+import org.apache.qpid.filter.SelectorParsingException;
+import org.apache.qpid.filter.selector.ParseException;
import org.apache.qpid.server.filter.JMSSelectorFilter;
public class SelectorParserTest extends TestCase
@@ -109,7 +110,11 @@ public class SelectorParserTest extends TestCase
{
new JMSSelectorFilter(selector);
}
- catch (AMQException e)
+ catch (ParseException e)
+ {
+ fail("Selector '" + selector + "' was not parsed :" + e.getMessage());
+ }
+ catch (SelectorParsingException e)
{
fail("Selector '" + selector + "' was not parsed :" + e.getMessage());
}
@@ -122,7 +127,11 @@ public class SelectorParserTest extends TestCase
new JMSSelectorFilter(selector);
fail("Selector '" + selector + "' was parsed ");
}
- catch (AMQException e)
+ catch (ParseException e)
+ {
+ //normal path
+ }
+ catch (SelectorParsingException e)
{
//normal path
}