diff options
| author | Kenneth Anthony Giusti <kgiusti@apache.org> | 2010-01-28 21:10:07 +0000 |
|---|---|---|
| committer | Kenneth Anthony Giusti <kgiusti@apache.org> | 2010-01-28 21:10:07 +0000 |
| commit | f1815fef1848e3fe006a9a4c944c6401ad7d6cc2 (patch) | |
| tree | b11bae5ffc4441cfeed115c58df32452181bd423 /python/qmf2/tests/basic_method.py | |
| parent | 6502cce999a8276679e6a74049f739483a3fe7dd (diff) | |
| download | qpid-python-f1815fef1848e3fe006a9a4c944c6401ad7d6cc2.tar.gz | |
QPID-2261: Rework query impl to use list-based approach
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@904268 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'python/qmf2/tests/basic_method.py')
| -rw-r--r-- | python/qmf2/tests/basic_method.py | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/python/qmf2/tests/basic_method.py b/python/qmf2/tests/basic_method.py index a12bbe7c4a..a1847efee9 100644 --- a/python/qmf2/tests/basic_method.py +++ b/python/qmf2/tests/basic_method.py @@ -22,7 +22,7 @@ from threading import Thread, Event import qpid.messaging from qmf2.common import (Notifier, SchemaObjectClass, SchemaClassId, SchemaProperty, qmfTypes, SchemaMethod, QmfQuery, - QmfData, QmfQueryPredicate, WorkItem) + QmfData, WorkItem) import qmf2.console from qmf2.agent import(QmfAgentData, Agent, MethodCallParams) @@ -247,11 +247,9 @@ class BaseTest(unittest.TestCase): self.assertTrue(agent and agent.get_name() == aname) query = QmfQuery.create_predicate(QmfQuery.TARGET_OBJECT, - QmfQueryPredicate( - {QmfQuery.LOGIC_AND: - [{QmfQuery.CMP_EXISTS: [SchemaClassId.KEY_PACKAGE]}, - {QmfQuery.CMP_EQ: [SchemaClassId.KEY_PACKAGE, - "MyPackage"]}]})) + [QmfQuery.AND, + [QmfQuery.EXISTS, [QmfQuery.QUOTE, SchemaClassId.KEY_PACKAGE]], + [QmfQuery.EQ, SchemaClassId.KEY_PACKAGE, [QmfQuery.QUOTE, "MyPackage"]]]) obj_list = self.console.do_query(agent, query) self.assertTrue(len(obj_list) == 2) @@ -297,11 +295,9 @@ class BaseTest(unittest.TestCase): self.assertTrue(agent and agent.get_name() == aname) query = QmfQuery.create_predicate(QmfQuery.TARGET_OBJECT, - QmfQueryPredicate( - {QmfQuery.LOGIC_AND: - [{QmfQuery.CMP_EXISTS: [SchemaClassId.KEY_PACKAGE]}, - {QmfQuery.CMP_EQ: [SchemaClassId.KEY_PACKAGE, - "MyPackage"]}]})) + [QmfQuery.AND, + [QmfQuery.EXISTS, [QmfQuery.QUOTE, SchemaClassId.KEY_PACKAGE]], + [QmfQuery.EQ, [QmfQuery.UNQUOTE, SchemaClassId.KEY_PACKAGE], [QmfQuery.QUOTE, "MyPackage"]]]) obj_list = self.console.do_query(agent, query) self.assertTrue(len(obj_list) == 2) |