[CalendarServer-changes] [9141] CalendarServer/trunk/calendarserver/tools/shell/test/test_cmd.py

source_changes at macosforge.org source_changes at macosforge.org
Mon Apr 16 16:57:09 PDT 2012


Revision: 9141
          http://trac.macosforge.org/projects/calendarserver/changeset/9141
Author:   wsanchez at apple.com
Date:     2012-04-16 16:57:09 -0700 (Mon, 16 Apr 2012)
Log Message:
-----------
Test zero and N word cases

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/shell/test/test_cmd.py

Modified: CalendarServer/trunk/calendarserver/tools/shell/test/test_cmd.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/shell/test/test_cmd.py	2012-04-16 23:49:26 UTC (rev 9140)
+++ CalendarServer/trunk/calendarserver/tools/shell/test/test_cmd.py	2012-04-16 23:57:09 UTC (rev 9141)
@@ -120,15 +120,33 @@
         commands = protocol.commands
 
         def c(word):
+            # One token
             d = commands.complete_files((word,))
             d.addCallback(lambda c: sorted(c))
             return d
 
+        def d(word):
+            # Multiple tokens
+            d = commands.complete_files(("XYZZY", word))
+            d.addCallback(lambda c: sorted(c))
+            return d
+
+        def e(word):
+            # No tokens
+            d = commands.complete_files(())
+            d.addCallback(lambda c: sorted(c))
+            return d
+
         for word, completions in tests:
-            self.assertEquals((yield c(word)), completions, "Completing %r" % (word,))
+            if word is None:
+                self.assertEquals((yield e(word)), completions, "Completing %r" % (word,))
+            else:
+                self.assertEquals((yield c(word)), completions, "Completing %r" % (word,))
+                self.assertEquals((yield d(word)), completions, "Completing %r" % (word,))
 
     def test_completeFilesLevelOne(self):
         return self._test_completeFiles((
+            (None    , ["groups/", "locations/", "resources/", "uids/", "users/"]),
             (""      , ["groups/", "locations/", "resources/", "uids/", "users/"]),
             ("u"     , ["ids/", "sers/"]),
             ("g"     , ["roups/"]),
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120416/76a71f39/attachment.html>


More information about the calendarserver-changes mailing list