<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12744] CalendarServer/trunk/twistedcaldav/directory/test</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12744">12744</a></dd>
<dt>Author</dt> <dd>dre@apple.com</dd>
<dt>Date</dt> <dd>2014-02-24 09:56:03 -0800 (Mon, 24 Feb 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Conditional import of OD in unit tests</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytesttest_buildquerypy">CalendarServer/trunk/twistedcaldav/directory/test/test_buildquery.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytesttest_opendirectorybackerpy">CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectorybacker.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavdirectorytesttest_buildquerypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_buildquery.py (12743 => 12744)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/test/test_buildquery.py        2014-02-21 21:57:24 UTC (rev 12743)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_buildquery.py        2014-02-24 17:56:03 UTC (rev 12744)
</span><span class="lines">@@ -14,143 +14,147 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx"> 
</span><del>-from twistedcaldav.test.util import TestCase
-from twistedcaldav.directory.appleopendirectory import (buildQueries,
-    buildLocalQueriesFromTokens, OpenDirectoryService, buildNestedQueryFromTokens)
-from calendarserver.platform.darwin.od import dsattributes
</del><ins>+try:
+    from calendarserver.platform.darwin.od import dsattributes
+except ImportError:
+    pass
+else:
+    from twistedcaldav.test.util import TestCase
+    from twistedcaldav.directory.appleopendirectory import (buildQueries,
+        buildLocalQueriesFromTokens, OpenDirectoryService, buildNestedQueryFromTokens)
</ins><span class="cx"> 
</span><del>-class BuildQueryTests(TestCase):
</del><ins>+    class BuildQueryTests(TestCase):
</ins><span class="cx"> 
</span><del>-    def test_buildQuery(self):
-        self.assertEquals(
-            buildQueries(
-                [dsattributes.kDSStdRecordTypeUsers],
-                (
-                    (&quot;firstName&quot;, &quot;morgen&quot;, True, &quot;starts-with&quot;),
-                    (&quot;lastName&quot;, &quot;sagen&quot;, True, &quot;starts-with&quot;),
</del><ins>+        def test_buildQuery(self):
+            self.assertEquals(
+                buildQueries(
+                    [dsattributes.kDSStdRecordTypeUsers],
+                    (
+                        (&quot;firstName&quot;, &quot;morgen&quot;, True, &quot;starts-with&quot;),
+                        (&quot;lastName&quot;, &quot;sagen&quot;, True, &quot;starts-with&quot;),
+                    ),
+                    OpenDirectoryService._ODFields
</ins><span class="cx">                 ),
</span><del>-                OpenDirectoryService._ODFields
-            ),
-            {
-                ('dsAttrTypeStandard:FirstName', 'morgen', True, 'starts-with') : [dsattributes.kDSStdRecordTypeUsers],
-                ('dsAttrTypeStandard:LastName', 'sagen', True, 'starts-with') : [dsattributes.kDSStdRecordTypeUsers],
-            }
-        )
-        self.assertEquals(
-            buildQueries(
-                [
-                    dsattributes.kDSStdRecordTypeUsers,
-                ],
-                (
-                    (&quot;firstName&quot;, &quot;morgen&quot;, True, &quot;starts-with&quot;),
-                    (&quot;emailAddresses&quot;, &quot;morgen&quot;, True, &quot;contains&quot;),
</del><ins>+                {
+                    ('dsAttrTypeStandard:FirstName', 'morgen', True, 'starts-with') : [dsattributes.kDSStdRecordTypeUsers],
+                    ('dsAttrTypeStandard:LastName', 'sagen', True, 'starts-with') : [dsattributes.kDSStdRecordTypeUsers],
+                }
+            )
+            self.assertEquals(
+                buildQueries(
+                    [
+                        dsattributes.kDSStdRecordTypeUsers,
+                    ],
+                    (
+                        (&quot;firstName&quot;, &quot;morgen&quot;, True, &quot;starts-with&quot;),
+                        (&quot;emailAddresses&quot;, &quot;morgen&quot;, True, &quot;contains&quot;),
+                    ),
+                    OpenDirectoryService._ODFields
</ins><span class="cx">                 ),
</span><del>-                OpenDirectoryService._ODFields
-            ),
-            {
-                ('dsAttrTypeStandard:FirstName', 'morgen', True, 'starts-with') : [dsattributes.kDSStdRecordTypeUsers],
-                ('dsAttrTypeStandard:EMailAddress', 'morgen', True, 'contains') : [dsattributes.kDSStdRecordTypeUsers],
-            }
-        )
-        self.assertEquals(
-            buildQueries(
-                [
-                    dsattributes.kDSStdRecordTypeGroups,
-                ],
-                (
-                    (&quot;firstName&quot;, &quot;morgen&quot;, True, &quot;starts-with&quot;),
-                    (&quot;lastName&quot;, &quot;morgen&quot;, True, &quot;starts-with&quot;),
-                    (&quot;fullName&quot;, &quot;morgen&quot;, True, &quot;starts-with&quot;),
-                    (&quot;emailAddresses&quot;, &quot;morgen&quot;, True, &quot;contains&quot;),
</del><ins>+                {
+                    ('dsAttrTypeStandard:FirstName', 'morgen', True, 'starts-with') : [dsattributes.kDSStdRecordTypeUsers],
+                    ('dsAttrTypeStandard:EMailAddress', 'morgen', True, 'contains') : [dsattributes.kDSStdRecordTypeUsers],
+                }
+            )
+            self.assertEquals(
+                buildQueries(
+                    [
+                        dsattributes.kDSStdRecordTypeGroups,
+                    ],
+                    (
+                        (&quot;firstName&quot;, &quot;morgen&quot;, True, &quot;starts-with&quot;),
+                        (&quot;lastName&quot;, &quot;morgen&quot;, True, &quot;starts-with&quot;),
+                        (&quot;fullName&quot;, &quot;morgen&quot;, True, &quot;starts-with&quot;),
+                        (&quot;emailAddresses&quot;, &quot;morgen&quot;, True, &quot;contains&quot;),
+                    ),
+                    OpenDirectoryService._ODFields
</ins><span class="cx">                 ),
</span><del>-                OpenDirectoryService._ODFields
-            ),
-            {
-                ('dsAttrTypeStandard:RealName', 'morgen', True, 'starts-with') : [dsattributes.kDSStdRecordTypeGroups],
-                ('dsAttrTypeStandard:EMailAddress', 'morgen', True, 'contains') : [dsattributes.kDSStdRecordTypeGroups],
-            }
-        )
-        self.assertEquals(
-            buildQueries(
-                [
-                    dsattributes.kDSStdRecordTypeUsers,
-                    dsattributes.kDSStdRecordTypeGroups,
-                ],
-                (
-                    (&quot;firstName&quot;, &quot;morgen&quot;, True, &quot;starts-with&quot;),
-                    (&quot;lastName&quot;, &quot;morgen&quot;, True, &quot;starts-with&quot;),
-                    (&quot;fullName&quot;, &quot;morgen&quot;, True, &quot;starts-with&quot;),
-                    (&quot;emailAddresses&quot;, &quot;morgen&quot;, True, &quot;contains&quot;),
</del><ins>+                {
+                    ('dsAttrTypeStandard:RealName', 'morgen', True, 'starts-with') : [dsattributes.kDSStdRecordTypeGroups],
+                    ('dsAttrTypeStandard:EMailAddress', 'morgen', True, 'contains') : [dsattributes.kDSStdRecordTypeGroups],
+                }
+            )
+            self.assertEquals(
+                buildQueries(
+                    [
+                        dsattributes.kDSStdRecordTypeUsers,
+                        dsattributes.kDSStdRecordTypeGroups,
+                    ],
+                    (
+                        (&quot;firstName&quot;, &quot;morgen&quot;, True, &quot;starts-with&quot;),
+                        (&quot;lastName&quot;, &quot;morgen&quot;, True, &quot;starts-with&quot;),
+                        (&quot;fullName&quot;, &quot;morgen&quot;, True, &quot;starts-with&quot;),
+                        (&quot;emailAddresses&quot;, &quot;morgen&quot;, True, &quot;contains&quot;),
+                    ),
+                    OpenDirectoryService._ODFields
</ins><span class="cx">                 ),
</span><del>-                OpenDirectoryService._ODFields
-            ),
-            {
-                ('dsAttrTypeStandard:RealName', 'morgen', True, 'starts-with') : [dsattributes.kDSStdRecordTypeUsers, dsattributes.kDSStdRecordTypeGroups],
-                ('dsAttrTypeStandard:EMailAddress', 'morgen', True, 'contains') : [dsattributes.kDSStdRecordTypeUsers, dsattributes.kDSStdRecordTypeGroups],
-                ('dsAttrTypeStandard:FirstName', 'morgen', True, 'starts-with') : [dsattributes.kDSStdRecordTypeUsers],
-                ('dsAttrTypeStandard:LastName', 'morgen', True, 'starts-with') : [dsattributes.kDSStdRecordTypeUsers],
-            }
-        )
-        self.assertEquals(
-            buildQueries(
-                [
-                    dsattributes.kDSStdRecordTypeGroups,
-                ],
-                (
-                    (&quot;firstName&quot;, &quot;morgen&quot;, True, &quot;starts-with&quot;),
</del><ins>+                {
+                    ('dsAttrTypeStandard:RealName', 'morgen', True, 'starts-with') : [dsattributes.kDSStdRecordTypeUsers, dsattributes.kDSStdRecordTypeGroups],
+                    ('dsAttrTypeStandard:EMailAddress', 'morgen', True, 'contains') : [dsattributes.kDSStdRecordTypeUsers, dsattributes.kDSStdRecordTypeGroups],
+                    ('dsAttrTypeStandard:FirstName', 'morgen', True, 'starts-with') : [dsattributes.kDSStdRecordTypeUsers],
+                    ('dsAttrTypeStandard:LastName', 'morgen', True, 'starts-with') : [dsattributes.kDSStdRecordTypeUsers],
+                }
+            )
+            self.assertEquals(
+                buildQueries(
+                    [
+                        dsattributes.kDSStdRecordTypeGroups,
+                    ],
+                    (
+                        (&quot;firstName&quot;, &quot;morgen&quot;, True, &quot;starts-with&quot;),
+                    ),
+                    OpenDirectoryService._ODFields
</ins><span class="cx">                 ),
</span><del>-                OpenDirectoryService._ODFields
-            ),
-            {
-            }
-        )
</del><ins>+                {
+                }
+            )
</ins><span class="cx"> 
</span><span class="cx"> 
</span><del>-    def test_buildLocalQueryFromTokens(self):
-        &quot;&quot;&quot;
-        Verify the generating of the simpler queries passed to /Local/Default
-        &quot;&quot;&quot;
-        results = buildLocalQueriesFromTokens([], OpenDirectoryService._ODFields)
-        self.assertEquals(results, None)
</del><ins>+        def test_buildLocalQueryFromTokens(self):
+            &quot;&quot;&quot;
+            Verify the generating of the simpler queries passed to /Local/Default
+            &quot;&quot;&quot;
+            results = buildLocalQueriesFromTokens([], OpenDirectoryService._ODFields)
+            self.assertEquals(results, None)
</ins><span class="cx"> 
</span><del>-        results = buildLocalQueriesFromTokens([&quot;foo&quot;], OpenDirectoryService._ODFields)
-        self.assertEquals(
-            results[0].generate(),
-            &quot;(|(dsAttrTypeStandard:RealName=*foo*)(dsAttrTypeStandard:EMailAddress=foo*))&quot;
-        )
</del><ins>+            results = buildLocalQueriesFromTokens([&quot;foo&quot;], OpenDirectoryService._ODFields)
+            self.assertEquals(
+                results[0].generate(),
+                &quot;(|(dsAttrTypeStandard:RealName=*foo*)(dsAttrTypeStandard:EMailAddress=foo*))&quot;
+            )
</ins><span class="cx"> 
</span><del>-        results = buildLocalQueriesFromTokens([&quot;foo&quot;, &quot;bar&quot;], OpenDirectoryService._ODFields)
-        self.assertEquals(
-            results[0].generate(),
-            &quot;(|(dsAttrTypeStandard:RealName=*foo*)(dsAttrTypeStandard:EMailAddress=foo*))&quot;
-        )
-        self.assertEquals(
-            results[1].generate(),
-            &quot;(|(dsAttrTypeStandard:RealName=*bar*)(dsAttrTypeStandard:EMailAddress=bar*))&quot;
-        )
</del><ins>+            results = buildLocalQueriesFromTokens([&quot;foo&quot;, &quot;bar&quot;], OpenDirectoryService._ODFields)
+            self.assertEquals(
+                results[0].generate(),
+                &quot;(|(dsAttrTypeStandard:RealName=*foo*)(dsAttrTypeStandard:EMailAddress=foo*))&quot;
+            )
+            self.assertEquals(
+                results[1].generate(),
+                &quot;(|(dsAttrTypeStandard:RealName=*bar*)(dsAttrTypeStandard:EMailAddress=bar*))&quot;
+            )
</ins><span class="cx"> 
</span><span class="cx"> 
</span><del>-    def test_buildNestedQueryFromTokens(self):
-        &quot;&quot;&quot;
-        Verify the generating of the complex nested queries
-        &quot;&quot;&quot;
-        query = buildNestedQueryFromTokens([], OpenDirectoryService._ODFields)
-        self.assertEquals(query, None)
</del><ins>+        def test_buildNestedQueryFromTokens(self):
+            &quot;&quot;&quot;
+            Verify the generating of the complex nested queries
+            &quot;&quot;&quot;
+            query = buildNestedQueryFromTokens([], OpenDirectoryService._ODFields)
+            self.assertEquals(query, None)
</ins><span class="cx"> 
</span><del>-        query = buildNestedQueryFromTokens([&quot;foo&quot;], OpenDirectoryService._ODFields)
-        self.assertEquals(
-            query.generate(),
-            &quot;(|(dsAttrTypeStandard:RealName=*foo*)(dsAttrTypeStandard:EMailAddress=foo*)(dsAttrTypeStandard:RecordName=foo*))&quot;
-        )
</del><ins>+            query = buildNestedQueryFromTokens([&quot;foo&quot;], OpenDirectoryService._ODFields)
+            self.assertEquals(
+                query.generate(),
+                &quot;(|(dsAttrTypeStandard:RealName=*foo*)(dsAttrTypeStandard:EMailAddress=foo*)(dsAttrTypeStandard:RecordName=foo*))&quot;
+            )
</ins><span class="cx"> 
</span><del>-        query = buildNestedQueryFromTokens([&quot;foo&quot;, &quot;bar&quot;], OpenDirectoryService._ODFields)
-        self.assertEquals(
-            query.generate(),
-            &quot;(&amp;(|(dsAttrTypeStandard:RealName=*foo*)(dsAttrTypeStandard:EMailAddress=foo*)(dsAttrTypeStandard:RecordName=foo*))(|(dsAttrTypeStandard:RealName=*bar*)(dsAttrTypeStandard:EMailAddress=bar*)(dsAttrTypeStandard:RecordName=bar*)))&quot;
-        )
</del><ins>+            query = buildNestedQueryFromTokens([&quot;foo&quot;, &quot;bar&quot;], OpenDirectoryService._ODFields)
+            self.assertEquals(
+                query.generate(),
+                &quot;(&amp;(|(dsAttrTypeStandard:RealName=*foo*)(dsAttrTypeStandard:EMailAddress=foo*)(dsAttrTypeStandard:RecordName=foo*))(|(dsAttrTypeStandard:RealName=*bar*)(dsAttrTypeStandard:EMailAddress=bar*)(dsAttrTypeStandard:RecordName=bar*)))&quot;
+            )
</ins><span class="cx"> 
</span><del>-        query = buildNestedQueryFromTokens([&quot;foo&quot;, &quot;bar&quot;, &quot;baz&quot;], OpenDirectoryService._ODFields)
-        self.assertEquals(
-            query.generate(),
-            &quot;(&amp;(|(dsAttrTypeStandard:RealName=*foo*)(dsAttrTypeStandard:EMailAddress=foo*)(dsAttrTypeStandard:RecordName=foo*))(|(dsAttrTypeStandard:RealName=*bar*)(dsAttrTypeStandard:EMailAddress=bar*)(dsAttrTypeStandard:RecordName=bar*))(|(dsAttrTypeStandard:RealName=*baz*)(dsAttrTypeStandard:EMailAddress=baz*)(dsAttrTypeStandard:RecordName=baz*)))&quot;
-        )
</del><ins>+            query = buildNestedQueryFromTokens([&quot;foo&quot;, &quot;bar&quot;, &quot;baz&quot;], OpenDirectoryService._ODFields)
+            self.assertEquals(
+                query.generate(),
+                &quot;(&amp;(|(dsAttrTypeStandard:RealName=*foo*)(dsAttrTypeStandard:EMailAddress=foo*)(dsAttrTypeStandard:RecordName=foo*))(|(dsAttrTypeStandard:RealName=*bar*)(dsAttrTypeStandard:EMailAddress=bar*)(dsAttrTypeStandard:RecordName=bar*))(|(dsAttrTypeStandard:RealName=*baz*)(dsAttrTypeStandard:EMailAddress=baz*)(dsAttrTypeStandard:RecordName=baz*)))&quot;
+            )
</ins></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorytesttest_opendirectorybackerpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectorybacker.py (12743 => 12744)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectorybacker.py        2014-02-21 21:57:24 UTC (rev 12743)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectorybacker.py        2014-02-24 17:56:03 UTC (rev 12744)
</span><span class="lines">@@ -14,38 +14,42 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx"> 
</span><del>-from twistedcaldav.directory.opendirectorybacker import VCardRecord
-from twistedcaldav.test.util import TestCase
</del><ins>+try:
+    from twistedcaldav.directory.opendirectorybacker import VCardRecord
+except ImportError:
+    pass
+else:
+    from twistedcaldav.test.util import TestCase
</ins><span class="cx"> 
</span><del>-class VCardRecordTestCase(TestCase):
</del><ins>+    class VCardRecordTestCase(TestCase):
</ins><span class="cx"> 
</span><span class="cx"> 
</span><del>-    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@example.com', 'second@example.com'],
-            u'dsAttrTypeStandard:RealName': 'Amanda Test',
-        }
-        vcardRecord = VCardRecord(StubService(), attributes)
-        vcard = vcardRecord.vCard()
-        properties = set([prop.value() for prop in vcard.properties(&quot;TEL&quot;)])
-        self.assertEquals(properties, set([&quot;408 555-1212&quot;, &quot;415 555-1212&quot;]))
-        properties = set([prop.value() for prop in vcard.properties(&quot;EMAIL&quot;)])
-        self.assertEquals(properties, set([&quot;amanda@example.com&quot;, &quot;second@example.com&quot;]))
</del><ins>+        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@example.com', 'second@example.com'],
+                u'dsAttrTypeStandard:RealName': 'Amanda Test',
+            }
+            vcardRecord = VCardRecord(StubService(), attributes)
+            vcard = vcardRecord.vCard()
+            properties = set([prop.value() for prop in vcard.properties(&quot;TEL&quot;)])
+            self.assertEquals(properties, set([&quot;408 555-1212&quot;, &quot;415 555-1212&quot;]))
+            properties = set([prop.value() for prop in vcard.properties(&quot;EMAIL&quot;)])
+            self.assertEquals(properties, set([&quot;amanda@example.com&quot;, &quot;second@example.com&quot;]))
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-class StubService(object):
-    addDSAttrXProperties = False
-    directoryBackedAddressBook = None
-    appleInternalServer = False
-    realmName = &quot;testing&quot;
</del><ins>+    class StubService(object):
+        addDSAttrXProperties = False
+        directoryBackedAddressBook = None
+        appleInternalServer = False
+        realmName = &quot;testing&quot;
</ins></span></pre>
</div>
</div>

</body>
</html>