[CalendarServer-changes] [12294] twext/trunk/twext/who/ldap/test/test_util.py

[source_changes at macosforge.org]

Revision: 12294
          http://trac.calendarserver.org//changeset/12294
Author:   wsanchez at apple.com
Date:     2014-01-10 16:03:44 -0800 (Fri, 10 Jan 2014)
Log Message:
-----------
More tests.

Modified Paths:
--------------
    twext/trunk/twext/who/ldap/test/test_util.py

Modified: twext/trunk/twext/who/ldap/test/test_util.py
===================================================================
--- twext/trunk/twext/who/ldap/test/test_util.py	2014-01-10 23:13:03 UTC (rev 12293)
+++ twext/trunk/twext/who/ldap/test/test_util.py	2014-01-11 00:03:44 UTC (rev 12294)
@@ -134,7 +134,7 @@
         queryString = ldapQueryStringFromMatchExpression(
             expression, self.attrMap(service)
         )
-        expected= u"({attribute}={expected})".format(
+        expected = u"({attribute}={expected})".format(
             attribute="fullNames",
             expected=(
                 u"\\5Cxyzzy: a\\2Fb\\2F\\28c\\29\\2A "
@@ -144,7 +144,9 @@
         self.assertEquals(queryString, expected)
 
 
-    def test_queryStringFromCompoundExpression_single(self):
+    def test_queryStringFromCompoundExpression_single(
+        self, queryFunction=ldapQueryStringFromCompoundExpression
+    ):
         """
         Compound expression with a single sub-expression.
 
@@ -164,7 +166,7 @@
                 [matchExpression],
                 operand
             )
-            queryString = ldapQueryStringFromCompoundExpression(
+            queryString = queryFunction(
                 compoundExpression, self.attrMap(service)
             )
             expected = u"{match}".format(
@@ -175,7 +177,9 @@
             self.assertEquals(queryString, expected)
 
 
-    def test_queryStringFromCompoundExpression_multiple(self):
+    def test_queryStringFromCompoundExpression_multiple(
+        self, queryFunction=ldapQueryStringFromCompoundExpression
+    ):
         """
         Compound expression with multiple sub-expressions.
 
@@ -194,7 +198,7 @@
                 [matchExpression1, matchExpression2],
                 operand
             )
-            queryString = ldapQueryStringFromCompoundExpression(
+            queryString = queryFunction(
                 compoundExpression, self.attrMap(service)
             )
             expected = u"({op}{match1}{match2})".format(
@@ -231,11 +235,15 @@
         """
         Compound expression.
         """
-        raise NotImplementedError()
+        ldapQueryStringFromExpression = lambda e, a: u""
+        self.test_queryStringFromCompoundExpression_single(
+            queryFunction=ldapQueryStringFromExpression
+        )
+        self.test_queryStringFromCompoundExpression_multiple(
+            queryFunction=ldapQueryStringFromExpression
+        )
 
-    test_queryStringFromExpression_compound.todo = "unimplemented"
 
-
     def test_queryStringFromExpression_unknown(self):
         """
         Unknown expression.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/e68c7a62/attachment.html>