[CalendarServer-changes] [7183] CalendarServer/trunk/calendarserver/platform/darwin/od

[source_changes at macosforge.org]

Revision: 7183
          http://trac.macosforge.org/projects/calendarserver/changeset/7183
Author:   sagen at apple.com
Date:     2011-03-11 09:10:42 -0800 (Fri, 11 Mar 2011)
Log Message:
-----------
Add more tests for non-ascii names

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/platform/darwin/od/setup_directory.py
    CalendarServer/trunk/calendarserver/platform/darwin/od/test/test_opendirectory.py

Modified: CalendarServer/trunk/calendarserver/platform/darwin/od/setup_directory.py
===================================================================
--- CalendarServer/trunk/calendarserver/platform/darwin/od/setup_directory.py	2011-03-11 15:07:43 UTC (rev 7182)
+++ CalendarServer/trunk/calendarserver/platform/darwin/od/setup_directory.py	2011-03-11 17:10:42 UTC (rev 7183)
@@ -90,6 +90,30 @@
             dsattributes.kDS1AttrPrimaryGroupID : ["20"],
         },
     ),
+    (
+        "odtestat at sign",
+        {
+            dsattributes.kDS1AttrFirstName : ["AtSign"],
+            dsattributes.kDS1AttrLastName  : ["Test"],
+            dsattributes.kDS1AttrDistinguishedName : ["At Sign Test"],
+            dsattributes.kDSNAttrEMailAddress : ["attsign at example.com"],
+            dsattributes.kDS1AttrGeneratedUID : ["71646A3A-1CEF-4744-AB1D-0AC855E25DC8"],
+            dsattributes.kDS1AttrUniqueID : ["33305"],
+            dsattributes.kDS1AttrPrimaryGroupID : ["20"],
+        },
+    ),
+    (
+        "odtestsatou",
+        {
+            dsattributes.kDS1AttrFirstName : ["\xe4\xbd\x90\xe8\x97\xa4\xe4\xbd\x90\xe8\x97\xa4\xe4\xbd\x90\xe8\x97\xa4".decode("utf-8")],
+            dsattributes.kDS1AttrLastName  : ["Test \xe4\xbd\x90\xe8\x97\xa4".decode("utf-8")],
+            dsattributes.kDS1AttrDistinguishedName : ["\xe4\xbd\x90\xe8\x97\xa4\xe4\xbd\x90\xe8\x97\xa4\xe4\xbd\x90\xe8\x97\xa4 Test \xe4\xbd\x90\xe8\x97\xa4".decode("utf-8")],
+            dsattributes.kDSNAttrEMailAddress : ["satou at example.com"],
+            dsattributes.kDS1AttrGeneratedUID : ["C662F833-75AD-4589-9879-5FF102943CEF"],
+            dsattributes.kDS1AttrUniqueID : ["33306"],
+            dsattributes.kDS1AttrPrimaryGroupID : ["20"],
+        },
+    ),
 ]
 
 masterGroups = [

Modified: CalendarServer/trunk/calendarserver/platform/darwin/od/test/test_opendirectory.py
===================================================================
--- CalendarServer/trunk/calendarserver/platform/darwin/od/test/test_opendirectory.py	2011-03-11 15:07:43 UTC (rev 7182)
+++ CalendarServer/trunk/calendarserver/platform/darwin/od/test/test_opendirectory.py	2011-03-11 17:10:42 UTC (rev 7183)
@@ -283,9 +283,11 @@
             )
             recordNames = [x[0] for x in results]
             for recordName, info in setup_directory.masterUsers:
-                self.assertTrue(recordName in recordNames)
+                if info[dsattributes.kDS1AttrLastName] == "Test":
+                    self.assertTrue(recordName in recordNames)
             for recordName, info in setup_directory.localUsers:
-                self.assertTrue(recordName in recordNames)
+                if info[dsattributes.kDS1AttrLastName] == "Test":
+                    self.assertTrue(recordName in recordNames)
 
         def test_queryRecordsWithAttribute_list_lastname_exact_insensitive_match_multitype(self):
 
@@ -308,9 +310,11 @@
             )
             recordNames = [x[0] for x in results]
             for recordName, info in setup_directory.masterUsers:
-                self.assertTrue(recordName in recordNames)
+                if info[dsattributes.kDS1AttrLastName] == "Test":
+                    self.assertTrue(recordName in recordNames)
             for recordName, info in setup_directory.localUsers:
-                self.assertTrue(recordName in recordNames)
+                if info[dsattributes.kDS1AttrLastName] == "Test":
+                    self.assertTrue(recordName in recordNames)
 
         def test_queryRecordsWithAttribute_list_lastname_begins_insensitive_match(self):
 
@@ -866,3 +870,19 @@
                 result[dsattributes.kDS1AttrGeneratedUID],
                 "CA795296-D77A-4E09-A72F-869920A3D284"
             )
+
+            results = opendirectory.queryRecordsWithAttribute_list(
+                directory,
+                dsattributes.kDS1AttrFirstName,
+                "\xe4\xbd\x90\xe8\x97\xa4",
+                dsattributes.eDSStartsWith,
+                False,
+                dsattributes.kDSStdRecordTypeUsers,
+                USER_ATTRIBUTES,
+                count=0
+            )
+            result = results[0][1]
+            self.assertEquals(
+                result[dsattributes.kDS1AttrGeneratedUID],
+                "C662F833-75AD-4589-9879-5FF102943CEF"
+            )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110311/c307867b/attachment.html>