[CalendarServer-changes] [7336] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Apr 20 13:27:51 PDT 2011
Revision: 7336
http://trac.macosforge.org/projects/calendarserver/changeset/7336
Author: cdaboo at apple.com
Date: 2011-04-20 13:27:48 -0700 (Wed, 20 Apr 2011)
Log Message:
-----------
Test i18n CN parameter inserts.
Modified Paths:
--------------
CalDAVTester/trunk/odsetup.py
CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
CalDAVTester/trunk/scripts/server/serverinfo-template.xml
CalDAVTester/trunk/scripts/server/serverinfo.xml
CalDAVTester/trunk/scripts/server/sslserverinfo.xml
CalDAVTester/trunk/scripts/tests/CalDAV/nonascii.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/nonascii/13.ics
CalDAVTester/trunk/Resource/CalDAV/nonascii/14.ics
Property Changed:
----------------
CalDAVTester/trunk/
Property changes on: CalDAVTester/trunk
___________________________________________________________________
Modified: svn:ignore
- .project
.pydevproject
+ .project
.pydevproject
.settings
Added: CalDAVTester/trunk/Resource/CalDAV/nonascii/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/nonascii/13.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/nonascii/13.ics 2011-04-20 20:27:48 UTC (rev 7336)
@@ -0,0 +1,32 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+SUMMARY:test
+UID:cntest at example.com
+ORGANIZER:$i18ncuaddr:
+ATTENDEE;PARTSTAT=ACCEPTED:$i18ncuaddr:
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/nonascii/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/nonascii/14.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/nonascii/14.ics 2011-04-20 20:27:48 UTC (rev 7336)
@@ -0,0 +1,32 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+SUMMARY:test
+UID:cntest at example.com
+ORGANIZER;CN=$i18nname:;EMAIL=$i18nemail::$i18ncuaddrurn:
+ATTENDEE;CN=$i18nname:;EMAIL=$i18nemail:;PARTSTAT=ACCEPTED:$i18ncuaddrurn:
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/trunk/odsetup.py
===================================================================
--- CalDAVTester/trunk/odsetup.py 2011-04-20 19:20:07 UTC (rev 7335)
+++ CalDAVTester/trunk/odsetup.py 2011-04-20 20:27:48 UTC (rev 7336)
@@ -1,7 +1,8 @@
#!/usr/bin/env python
+# coding=utf-8
#
##
-# Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2011 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.
@@ -102,6 +103,13 @@
"dsAttrTypeStandard:Country": "AAA",
}
+i18nattrs = {
+ "dsAttrTypeStandard:RealName": "まだ",
+ "dsAttrTypeStandard:FirstName": "ま",
+ "dsAttrTypeStandard:LastName": "だ",
+ "dsAttrTypeStandard:EMailAddress": "i18nuser at example.com",
+}
+
locationcreatecmd = """<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
@@ -205,6 +213,7 @@
records = (
("/Users", "testadmin", "testadmin", adminattrs, 1),
("/Users", "apprentice", "apprentice", apprenticeattrs, 1),
+ ("/Users", "i18nuser", "i18nuser", i18nattrs, 1),
("/Users", "user%02d", "user%02d", userattrs, None),
("/Users", "public%02d", "public%02d", publicattrs, 10),
("/Places", "location%02d", "location%02d", locationattrs, 10),
@@ -370,6 +379,7 @@
subs = [
("$useradminguid:", guids["testadmin"]),
("$userapprenticeguid:", guids["apprentice"]),
+ ("$i18nguid:", guids["i18nuser"]),
("$groupguid1:", guids["group01"]),
]
Modified: CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml 2011-04-20 19:20:07 UTC (rev 7335)
+++ CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml 2011-04-20 20:27:48 UTC (rev 7336)
@@ -677,6 +677,45 @@
</substitution>
</repeat>
+ <!-- User with non-ascii name -->
+ <substitution>
+ <key>$i18nid:</key>
+ <value>i18nuser</value>
+ </substitution>
+ <!-- group guid-->
+ <substitution>
+ <key>$i18nguid:</key>
+ <value>i18nuser</value>
+ </substitution>
+ <!-- group name-->
+ <substitution>
+ <key>$i18nname:</key>
+ <value>まだ</value>
+ </substitution>
+ <!-- password -->
+ <substitution>
+ <key>$i18npswd:</key>
+ <value>i18nuser</value>
+ </substitution>
+ <!-- relative path to user calendar-->
+ <substitution>
+ <key>$i18ncalendarpath:</key>
+ <value>$calendars_uids:$i18nguid:/$calendar:</value>
+ </substitution>
+ <substitution>
+ <key>$i18nemail:</key>
+ <value>$i18nid:@example.com</value>
+ </substitution>
+ <!-- CUAddrs -->
+ <substitution>
+ <key>$i18ncuaddr:</key>
+ <value>mailto:$i18nemail:</value>
+ </substitution>
+ <substitution>
+ <key>$i18ncuaddrurn:</key>
+ <value>urn:uuid:$i18nguid:</value>
+ </substitution>
+
<!-- relative path to disabled group principal resource-->
<substitution>
<key>$principaldisabled:</key>
Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2011-04-20 19:20:07 UTC (rev 7335)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2011-04-20 20:27:48 UTC (rev 7336)
@@ -678,6 +678,45 @@
</substitution>
</repeat>
+ <!-- User with non-ascii name -->
+ <substitution>
+ <key>$i18nid:</key>
+ <value>i18nuser</value>
+ </substitution>
+ <!-- group guid-->
+ <substitution>
+ <key>$i18nguid:</key>
+ <value>i18nuser</value>
+ </substitution>
+ <!-- group name-->
+ <substitution>
+ <key>$i18nname:</key>
+ <value>まだ</value>
+ </substitution>
+ <!-- password -->
+ <substitution>
+ <key>$i18npswd:</key>
+ <value>i18nuser</value>
+ </substitution>
+ <!-- relative path to user calendar-->
+ <substitution>
+ <key>$i18ncalendarpath:</key>
+ <value>$calendars_uids:$i18nguid:/$calendar:</value>
+ </substitution>
+ <substitution>
+ <key>$i18nemail:</key>
+ <value>$i18nid:@example.com</value>
+ </substitution>
+ <!-- CUAddrs -->
+ <substitution>
+ <key>$i18ncuaddr:</key>
+ <value>mailto:$i18nemail:</value>
+ </substitution>
+ <substitution>
+ <key>$i18ncuaddrurn:</key>
+ <value>urn:uuid:$i18nguid:</value>
+ </substitution>
+
<!-- relative path to disabled group principal resource-->
<substitution>
<key>$principaldisabled:</key>
Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2011-04-20 19:20:07 UTC (rev 7335)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2011-04-20 20:27:48 UTC (rev 7336)
@@ -679,6 +679,45 @@
</substitution>
</repeat>
+ <!-- User with non-ascii name -->
+ <substitution>
+ <key>$i18nid:</key>
+ <value>i18nuser</value>
+ </substitution>
+ <!-- group guid-->
+ <substitution>
+ <key>$i18nguid:</key>
+ <value>i18nuser</value>
+ </substitution>
+ <!-- group name-->
+ <substitution>
+ <key>$i18nname:</key>
+ <value>まだ</value>
+ </substitution>
+ <!-- password -->
+ <substitution>
+ <key>$i18npswd:</key>
+ <value>i18nuser</value>
+ </substitution>
+ <!-- relative path to user calendar-->
+ <substitution>
+ <key>$i18ncalendarpath:</key>
+ <value>$calendars_uids:$i18nguid:/$calendar:</value>
+ </substitution>
+ <substitution>
+ <key>$i18nemail:</key>
+ <value>$i18nid:@example.com</value>
+ </substitution>
+ <!-- CUAddrs -->
+ <substitution>
+ <key>$i18ncuaddr:</key>
+ <value>mailto:$i18nemail:</value>
+ </substitution>
+ <substitution>
+ <key>$i18ncuaddrurn:</key>
+ <value>urn:uuid:$i18nguid:</value>
+ </substitution>
+
<!-- relative path to disabled group principal resource-->
<substitution>
<key>$principaldisabled:</key>
Modified: CalDAVTester/trunk/scripts/server/sslserverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/sslserverinfo.xml 2011-04-20 19:20:07 UTC (rev 7335)
+++ CalDAVTester/trunk/scripts/server/sslserverinfo.xml 2011-04-20 20:27:48 UTC (rev 7336)
@@ -678,6 +678,45 @@
</substitution>
</repeat>
+ <!-- User with non-ascii name -->
+ <substitution>
+ <key>$i18nid:</key>
+ <value>i18nuser</value>
+ </substitution>
+ <!-- group guid-->
+ <substitution>
+ <key>$i18nguid:</key>
+ <value>i18nuser</value>
+ </substitution>
+ <!-- group name-->
+ <substitution>
+ <key>$i18nname:</key>
+ <value>まだ</value>
+ </substitution>
+ <!-- password -->
+ <substitution>
+ <key>$i18npswd:</key>
+ <value>i18nuser</value>
+ </substitution>
+ <!-- relative path to user calendar-->
+ <substitution>
+ <key>$i18ncalendarpath:</key>
+ <value>$calendars_uids:$i18nguid:/$calendar:</value>
+ </substitution>
+ <substitution>
+ <key>$i18nemail:</key>
+ <value>$i18nid:@example.com</value>
+ </substitution>
+ <!-- CUAddrs -->
+ <substitution>
+ <key>$i18ncuaddr:</key>
+ <value>mailto:$i18nemail:</value>
+ </substitution>
+ <substitution>
+ <key>$i18ncuaddrurn:</key>
+ <value>urn:uuid:$i18nguid:</value>
+ </substitution>
+
<!-- relative path to disabled group principal resource-->
<substitution>
<key>$principaldisabled:</key>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/nonascii.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/nonascii.xml 2011-04-20 19:20:07 UTC (rev 7335)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/nonascii.xml 2011-04-20 20:27:48 UTC (rev 7336)
@@ -545,6 +545,37 @@
</test>
</test-suite>
+ <test-suite name="PUT with CN re-write" ignore='no'>
+ <test name='1'>
+ <description>PUT without CN</description>
+ <request user="$i18nid:" pswd="$i18npswd:" print-response='no'>
+ <method>PUT</method>
+ <ruri>$i18ncalendarpath:/cntest.ics</ruri>
+ <data substitutions='yes'>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/nonascii/13.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Check valid CN</description>
+ <request user="$i18nid:" pswd="$i18npswd:" print-response='no'>
+ <method>GET</method>
+ <ruri>$i18ncalendarpath:/cntest.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/nonascii/14.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
<end>
<request user="$userid2:" pswd="$pswd2:">
<method>DELETEALL</method>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110420/a94c0215/attachment-0001.html>
More information about the calendarserver-changes
mailing list