[CalendarServer-changes] [9776] CalendarServer/branches/users/gaya/directorybacker/twistedcaldav

[source_changes at macosforge.org]

Revision: 9776
          http://trac.macosforge.org/projects/calendarserver/changeset/9776
Author:   gaya at apple.com
Date:     2012-09-04 20:36:05 -0700 (Tue, 04 Sep 2012)
Log Message:
-----------
fix test

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/opendirectorybacker.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_opendirectorybacker.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/addressbookqueryfilter.py

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/opendirectorybacker.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/opendirectorybacker.py	2012-09-05 03:25:09 UTC (rev 9775)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/opendirectorybacker.py	2012-09-05 03:36:05 UTC (rev 9776)
@@ -1678,7 +1678,7 @@
                     source = "https://%s%s" % (config.ServerHostName, uri)
                 else:
                     source = "https://%s:%s%s" % (config.ServerHostName, config.SSLPort, uri)
-            elif config.HTTPPort:
+            else:
                 if config.HTTPPort == 80:
                     source = "http://%s%s" % (config.ServerHostName, uri) 
                 else:

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_opendirectorybacker.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_opendirectorybacker.py	2012-09-05 03:25:09 UTC (rev 9775)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_opendirectorybacker.py	2012-09-05 03:36:05 UTC (rev 9776)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
 # limitations under the License.
 ##
 
-from twistedcaldav.directory.opendirectorybacker import VCardRecord
+from twistedcaldav.directory.opendirectorybacker import ABDirectoryQueryResult
 from twistedcaldav.test.util import TestCase
 
-class VCardRecordTestCase(TestCase):
+class VCardResourceTestCase(TestCase):
 
 
     def test_multiplePhoneNumbersAndEmailAddresses(self):
         attributes={u'dsAttrTypeStandard:AppleMetaRecordName': ['uid=odtestamanda,cn=users,dc=dalek,dc=example,dc=com'], u'dsAttrTypeStandard:ModificationTimestamp': '20111017170937Z', u'dsAttrTypeStandard:PhoneNumber': ['408 555-1212', '415 555-1212'], u'dsAttrTypeStandard:RecordType': ['dsRecTypeStandard:Users'], u'dsAttrTypeStandard:AppleMetaNodeLocation': ['/LDAPv3/127.0.0.1'], u'dsAttrTypeStandard:RecordName': ['odtestamanda'], u'dsAttrTypeStandard:FirstName': 'Amanda', u'dsAttrTypeStandard:GeneratedUID': '9DC04A70-E6DD-11DF-9492-0800200C9A66', u'dsAttrTypeStandard:LastName': 'Test', u'dsAttrTypeStandard:CreationTimestamp': '20110927182945Z', u'dsAttrTypeStandard:EMailAddress': ['amanda at example.com', 'second at example.com'], u'dsAttrTypeStandard:RealName': 'Amanda Test'}
-        vcardRecord = VCardRecord(StubService(), attributes)
-        vcard = vcardRecord.vCard()
+        vcardresource = ABDirectoryQueryResult(StubService(), attributes)
+        vcard = vcardresource.vCard()
         properties = set([prop.value() for prop in vcard.properties("TEL")])
         self.assertEquals(properties, set(["408 555-1212", "415 555-1212"]))
         properties = set([prop.value() for prop in vcard.properties("EMAIL")])
@@ -31,7 +31,4 @@
 
 
 class StubService(object):
-    addDSAttrXProperties = False
-    directoryBackedAddressBook = None
-    appleInternalServer = False
-    realmName = "testing"
+    uri = "/directory/test/"

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/addressbookqueryfilter.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/addressbookqueryfilter.py	2012-09-05 03:25:09 UTC (rev 9775)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/addressbookqueryfilter.py	2012-09-05 03:36:05 UTC (rev 9776)
@@ -73,7 +73,7 @@
                     return not allof
             return allof
         else:
-            return not allof
+            return False
 
     def valid(self):
         """
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120904/e15bf1ba/attachment.html>