[CalendarServer-changes] [13202] twext/trunk/twext/who/opendirectory/test/test_service.py

[source_changes at macosforge.org]

Revision: 13202
          http://trac.calendarserver.org//changeset/13202
Author:   gaya at apple.com
Date:     2014-04-08 13:17:50 -0700 (Tue, 08 Apr 2014)
Log Message:
-----------
use _queryStringAndRecordTypesFromExpresssion()

Modified Paths:
--------------
    twext/trunk/twext/who/opendirectory/test/test_service.py

Modified: twext/trunk/twext/who/opendirectory/test/test_service.py
===================================================================
--- twext/trunk/twext/who/opendirectory/test/test_service.py	2014-04-08 19:55:26 UTC (rev 13201)
+++ twext/trunk/twext/who/opendirectory/test/test_service.py	2014-04-08 20:17:50 UTC (rev 13202)
@@ -75,7 +75,8 @@
                 service.fieldName.shortNames, u"xyzzy",
                 matchType=matchType
             )
-            queryString = service._queryStringFromExpression(expression)
+            queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
+            self.assertEquals(recordTypes, None)
             self.assertEquals(
                 queryString,
                 u"({attribute}{expected})".format(
@@ -94,7 +95,8 @@
             service.fieldName.shortNames, u"xyzzy",
             flags=MatchFlags.NOT
         )
-        queryString = service._queryStringFromExpression(expression)
+        queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
+        self.assertEquals(recordTypes, None)
         self.assertEquals(
             queryString,
             u"(!{attribute}=xyzzy)".format(
@@ -114,7 +116,8 @@
             service.fieldName.shortNames, u"xyzzy",
             flags=MatchFlags.caseInsensitive
         )
-        queryString = service._queryStringFromExpression(expression)
+        queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
+        self.assertEquals(recordTypes, None)
         self.assertEquals(
             queryString,
             u"???????({attribute}=xyzzy)".format(
@@ -137,7 +140,8 @@
             service.fieldName.fullNames,
             u"\\xyzzy: a/b/(c)* ~~ >=< ~~ &| \0!!"
         )
-        queryString = service._queryStringFromExpression(expression)
+        queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
+        self.assertEquals(recordTypes, None)
         self.assertEquals(
             queryString,
             u"({attribute}={expected})".format(
@@ -180,7 +184,8 @@
             ],
             Operand.AND
         )
-        queryString = service._queryStringFromExpression(expression)
+        queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
+        self.assertEquals(recordTypes, None)
         self.assertEquals(
             queryString,
             (
@@ -210,7 +215,8 @@
             ],
             Operand.OR
         )
-        queryString = service._queryStringFromExpression(expression)
+        queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
+        self.assertEquals(recordTypes, None)
         self.assertEquals(
             queryString,
             (
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140408/60ffda91/attachment-0001.html>