[CalendarServer-changes] [10788] CalendarServer/trunk/twext/who/test/test_xml.py

[source_changes at macosforge.org]

Revision: 10788
          http://trac.calendarserver.org//changeset/10788
Author:   wsanchez at apple.com
Date:     2013-02-21 17:39:48 -0800 (Thu, 21 Feb 2013)
Log Message:
-----------
unknownRecordTypes* tests are parsing tests.

Modified Paths:
--------------
    CalendarServer/trunk/twext/who/test/test_xml.py

Modified: CalendarServer/trunk/twext/who/test/test_xml.py
===================================================================
--- CalendarServer/trunk/twext/who/test/test_xml.py	2013-02-22 01:37:15 UTC (rev 10787)
+++ CalendarServer/trunk/twext/who/test/test_xml.py	2013-02-22 01:39:48 UTC (rev 10788)
@@ -351,7 +351,28 @@
         self.assertEquals(set(service.unknownFieldElements), set(("political-affiliation",)))
 
 
+    def test_unknownRecordTypesClean(self):
+        service = self.service()
+        self.assertEquals(set(service.unknownRecordTypes), set())
 
+
+    def test_unknownRecordTypesDirty(self):
+        service = self.service(xmlData=
+"""<?xml version="1.0" encoding="utf-8"?>
+
+<directory realm="Unknown Record Types">
+  <record type="camera">
+    <uid>__d600__</uid>
+    <short-name>d600</short-name>
+    <full-name>Nikon D600</full-name>
+  </record>
+</directory>
+"""
+        )
+        self.assertEquals(set(service.unknownRecordTypes), set(("camera",)))
+
+
+
 class DirectoryServiceQueryTest(BaseTest):
     @inlineCallbacks
     def test_queryAnd(self):
@@ -658,28 +679,7 @@
         self.assertRecords(records, ("__wsanchez__",))
 
 
-    def test_unknownRecordTypesClean(self):
-        service = self.service()
-        self.assertEquals(set(service.unknownRecordTypes), set())
 
-
-    def test_unknownRecordTypesDirty(self):
-        service = self.service(xmlData=
-"""<?xml version="1.0" encoding="utf-8"?>
-
-<directory realm="Unknown Record Types">
-  <record type="camera">
-    <uid>__d600__</uid>
-    <short-name>d600</short-name>
-    <full-name>Nikon D600</full-name>
-  </record>
-</directory>
-"""
-        )
-        self.assertEquals(set(service.unknownRecordTypes), set(("camera",)))
-
-
-
 class DirectoryServiceMutableTest(BaseTest):
     @inlineCallbacks
     def test_updateRecord(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130221/ce1b2ecc/attachment.html>