summaryrefslogtreecommitdiff
path: root/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
commita75276726c56e67087d7de909da69676bd93d40b (patch)
treedec858b3713efcf89ad713cf73cd59813f59bbc4 /java/broker/src/test
parentdad25a4a2b13964890aebb78b4133420aaac6909 (diff)
downloadqpid-python-a75276726c56e67087d7de909da69676bd93d40b.tar.gz
QPID-3801 : [Java] Move JMS Selector code into common
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1239643 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker/src/test')
-rw-r--r--java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java15
1 files changed, 12 insertions, 3 deletions
diff --git a/java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java b/java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java
index 3ba4f1c620..3e0e217eee 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java
+++ b/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
}