[CalendarServer-changes] [2456] CalendarServer/branches/users/cdaboo/proxy-db-cached-2451/ twistedcaldav/directory/test/test_proxyprincipaldb.py
source_changes at macosforge.org
source_changes at macosforge.org
Fri May 23 09:56:32 PDT 2008
Revision: 2456
http://trac.macosforge.org/projects/calendarserver/changeset/2456
Author: cdaboo at apple.com
Date: 2008-05-23 09:56:31 -0700 (Fri, 23 May 2008)
Log Message:
-----------
Not sure why all this was commented out. We really need the test though.
Modified Paths:
--------------
CalendarServer/branches/users/cdaboo/proxy-db-cached-2451/twistedcaldav/directory/test/test_proxyprincipaldb.py
Modified: CalendarServer/branches/users/cdaboo/proxy-db-cached-2451/twistedcaldav/directory/test/test_proxyprincipaldb.py
===================================================================
--- CalendarServer/branches/users/cdaboo/proxy-db-cached-2451/twistedcaldav/directory/test/test_proxyprincipaldb.py 2008-05-23 16:41:18 UTC (rev 2455)
+++ CalendarServer/branches/users/cdaboo/proxy-db-cached-2451/twistedcaldav/directory/test/test_proxyprincipaldb.py 2008-05-23 16:56:31 UTC (rev 2456)
@@ -19,155 +19,155 @@
import twistedcaldav.test.util
-#class ProxyPrincipalDB (twistedcaldav.test.util.TestCase):
-# """
-# Directory service provisioned principals.
-# """
-#
-# class old_CalendarUserProxyDatabase(CalendarUserProxyDatabase):
-#
-# def _db_version(self):
-# """
-# @return: the schema version assigned to this index.
-# """
-# return "3"
-#
-# def _db_init_data_tables(self, q):
-# """
-# Initialise the underlying database tables.
-# @param q: a database cursor to use.
-# """
-#
-# #
-# # GROUPS table
-# #
-# q.execute(
-# """
-# create table GROUPS (
-# GROUPNAME text,
-# MEMBER text
-# )
-# """
-# )
-#
-# class new_CalendarUserProxyDatabase(CalendarUserProxyDatabase):
-#
-# def _db_version(self):
-# """
-# @return: the schema version assigned to this index.
-# """
-# return "11"
-#
-# class newer_CalendarUserProxyDatabase(CalendarUserProxyDatabase):
-#
-# def _db_version(self):
-# """
-# @return: the schema version assigned to this index.
-# """
-# return "51"
-#
-# def test_normalDB(self):
-# """
-# DirectoryPrincipalResource.groupMembers()
-# """
-#
-# # Get the DB
-# db_path = self.mktemp()
-# os.mkdir(db_path)
-# db = CalendarUserProxyDatabase(db_path)
-# db.setGroupMembers("A", ("B", "C", "D",))
-# self.assertEqual(db.getMembers("A"), set(("B", "C", "D",)))
-# self.assertEqual(db.getMemberships("B"), set(("A",)))
-#
-# def test_DBIndexed(self):
-# """
-# DirectoryPrincipalResource.groupMembers()
-# """
-#
-# # Get the DB
-# db_path = self.mktemp()
-# os.mkdir(db_path)
-# db = CalendarUserProxyDatabase(db_path)
-# self.assertEqual(set([row[1] for row in db._db_execute("PRAGMA index_list(GROUPS)")]), set(("GROUPNAMES", "MEMBERS")))
-#
-# def test_OldDB(self):
-# """
-# DirectoryPrincipalResource.groupMembers()
-# """
-#
-# # Get the DB
-# db_path = self.mktemp()
-# os.mkdir(db_path)
-# db = self.old_CalendarUserProxyDatabase(db_path)
-# self.assertEqual(set([row[1] for row in db._db_execute("PRAGMA index_list(GROUPS)")]), set())
-#
-# def test_DBUpgrade(self):
-# """
-# DirectoryPrincipalResource.groupMembers()
-# """
-#
-# # Get the DB
-# db_path = self.mktemp()
-# os.mkdir(db_path)
-# db = self.old_CalendarUserProxyDatabase(db_path)
-# db.setGroupMembers("A", ("B", "C", "D",))
-# self.assertEqual(db.getMembers("A"), set(("B", "C", "D",)))
-# self.assertEqual(db.getMemberships("B"), set(("A",)))
-# self.assertEqual(set([row[1] for row in db._db_execute("PRAGMA index_list(GROUPS)")]), set())
-# db._db_close()
-# db = None
-#
-# db = CalendarUserProxyDatabase(db_path)
-# self.assertEqual(db.getMembers("A"), set(("B", "C", "D",)))
-# self.assertEqual(db.getMemberships("B"), set(("A",)))
-# self.assertEqual(set([row[1] for row in db._db_execute("PRAGMA index_list(GROUPS)")]), set(("GROUPNAMES", "MEMBERS")))
-# db._db_close()
-# db = None
-#
-# def test_DBUpgradeNewer(self):
-# """
-# DirectoryPrincipalResource.groupMembers()
-# """
-#
-# # Get the DB
-# db_path = self.mktemp()
-# os.mkdir(db_path)
-# db = self.old_CalendarUserProxyDatabase(db_path)
-# db.setGroupMembers("A", ("B", "C", "D",))
-# self.assertEqual(db.getMembers("A"), set(("B", "C", "D",)))
-# self.assertEqual(db.getMemberships("B"), set(("A",)))
-# self.assertEqual(set([row[1] for row in db._db_execute("PRAGMA index_list(GROUPS)")]), set())
-# db._db_close()
-# db = None
-#
-# db = self.new_CalendarUserProxyDatabase(db_path)
-# self.assertEqual(db.getMembers("A"), set(("B", "C", "D",)))
-# self.assertEqual(db.getMemberships("B"), set(("A",)))
-# self.assertEqual(set([row[1] for row in db._db_execute("PRAGMA index_list(GROUPS)")]), set(("GROUPNAMES", "MEMBERS")))
-# db._db_close()
-# db = None
-#
-# def test_DBNoUpgradeNewer(self):
-# """
-# DirectoryPrincipalResource.groupMembers()
-# """
-#
-# # Get the DB
-# db_path = self.mktemp()
-# os.mkdir(db_path)
-# db = self.new_CalendarUserProxyDatabase(db_path)
-# db.setGroupMembers("A", ("B", "C", "D",))
-# self.assertEqual(db.getMembers("A"), set(("B", "C", "D",)))
-# self.assertEqual(db.getMemberships("B"), set(("A",)))
-# self.assertEqual(set([row[1] for row in db._db_execute("PRAGMA index_list(GROUPS)")]), set(("GROUPNAMES", "MEMBERS")))
-# db._db_close()
-# db = None
-#
-# db = self.newer_CalendarUserProxyDatabase(db_path)
-# self.assertEqual(db.getMembers("A"), set(("B", "C", "D",)))
-# self.assertEqual(db.getMemberships("B"), set(("A",)))
-# self.assertEqual(set([row[1] for row in db._db_execute("PRAGMA index_list(GROUPS)")]), set(("GROUPNAMES", "MEMBERS")))
-# db._db_close()
-# db = None
+class ProxyPrincipalDB (twistedcaldav.test.util.TestCase):
+ """
+ Directory service provisioned principals.
+ """
+
+ class old_CalendarUserProxyDatabase(CalendarUserProxyDatabase):
+
+ def _db_version(self):
+ """
+ @return: the schema version assigned to this index.
+ """
+ return "3"
+
+ def _db_init_data_tables(self, q):
+ """
+ Initialise the underlying database tables.
+ @param q: a database cursor to use.
+ """
+
+ #
+ # GROUPS table
+ #
+ q.execute(
+ """
+ create table GROUPS (
+ GROUPNAME text,
+ MEMBER text
+ )
+ """
+ )
+ class new_CalendarUserProxyDatabase(CalendarUserProxyDatabase):
+
+ def _db_version(self):
+ """
+ @return: the schema version assigned to this index.
+ """
+ return "11"
+
+ class newer_CalendarUserProxyDatabase(CalendarUserProxyDatabase):
+
+ def _db_version(self):
+ """
+ @return: the schema version assigned to this index.
+ """
+ return "51"
+
+ def test_normalDB(self):
+ """
+ DirectoryPrincipalResource.groupMembers()
+ """
+
+ # Get the DB
+ db_path = self.mktemp()
+ os.mkdir(db_path)
+ db = CalendarUserProxyDatabase(db_path)
+ db.setGroupMembers("A", ("B", "C", "D",))
+ self.assertEqual(db.getMembers("A"), set(("B", "C", "D",)))
+ self.assertEqual(db.getMemberships("B"), set(("A",)))
+
+ def test_DBIndexed(self):
+ """
+ DirectoryPrincipalResource.groupMembers()
+ """
+
+ # Get the DB
+ db_path = self.mktemp()
+ os.mkdir(db_path)
+ db = CalendarUserProxyDatabase(db_path)
+ self.assertEqual(set([row[1] for row in db._db_execute("PRAGMA index_list(GROUPS)")]), set(("GROUPNAMES", "MEMBERS")))
+
+ def test_OldDB(self):
+ """
+ DirectoryPrincipalResource.groupMembers()
+ """
+
+ # Get the DB
+ db_path = self.mktemp()
+ os.mkdir(db_path)
+ db = self.old_CalendarUserProxyDatabase(db_path)
+ self.assertEqual(set([row[1] for row in db._db_execute("PRAGMA index_list(GROUPS)")]), set())
+
+ def test_DBUpgrade(self):
+ """
+ DirectoryPrincipalResource.groupMembers()
+ """
+
+ # Get the DB
+ db_path = self.mktemp()
+ os.mkdir(db_path)
+ db = self.old_CalendarUserProxyDatabase(db_path)
+ db.setGroupMembers("A", ("B", "C", "D",))
+ self.assertEqual(db.getMembers("A"), set(("B", "C", "D",)))
+ self.assertEqual(db.getMemberships("B"), set(("A",)))
+ self.assertEqual(set([row[1] for row in db._db_execute("PRAGMA index_list(GROUPS)")]), set())
+ db._db_close()
+ db = None
+
+ db = CalendarUserProxyDatabase(db_path)
+ self.assertEqual(db.getMembers("A"), set(("B", "C", "D",)))
+ self.assertEqual(db.getMemberships("B"), set(("A",)))
+ self.assertEqual(set([row[1] for row in db._db_execute("PRAGMA index_list(GROUPS)")]), set(("GROUPNAMES", "MEMBERS")))
+ db._db_close()
+ db = None
+
+ def test_DBUpgradeNewer(self):
+ """
+ DirectoryPrincipalResource.groupMembers()
+ """
+
+ # Get the DB
+ db_path = self.mktemp()
+ os.mkdir(db_path)
+ db = self.old_CalendarUserProxyDatabase(db_path)
+ db.setGroupMembers("A", ("B", "C", "D",))
+ self.assertEqual(db.getMembers("A"), set(("B", "C", "D",)))
+ self.assertEqual(db.getMemberships("B"), set(("A",)))
+ self.assertEqual(set([row[1] for row in db._db_execute("PRAGMA index_list(GROUPS)")]), set())
+ db._db_close()
+ db = None
+
+ db = self.new_CalendarUserProxyDatabase(db_path)
+ self.assertEqual(db.getMembers("A"), set(("B", "C", "D",)))
+ self.assertEqual(db.getMemberships("B"), set(("A",)))
+ self.assertEqual(set([row[1] for row in db._db_execute("PRAGMA index_list(GROUPS)")]), set(("GROUPNAMES", "MEMBERS")))
+ db._db_close()
+ db = None
+
+ def test_DBNoUpgradeNewer(self):
+ """
+ DirectoryPrincipalResource.groupMembers()
+ """
+
+ # Get the DB
+ db_path = self.mktemp()
+ os.mkdir(db_path)
+ db = self.new_CalendarUserProxyDatabase(db_path)
+ db.setGroupMembers("A", ("B", "C", "D",))
+ self.assertEqual(db.getMembers("A"), set(("B", "C", "D",)))
+ self.assertEqual(db.getMemberships("B"), set(("A",)))
+ self.assertEqual(set([row[1] for row in db._db_execute("PRAGMA index_list(GROUPS)")]), set(("GROUPNAMES", "MEMBERS")))
+ db._db_close()
+ db = None
+
+ db = self.newer_CalendarUserProxyDatabase(db_path)
+ self.assertEqual(db.getMembers("A"), set(("B", "C", "D",)))
+ self.assertEqual(db.getMemberships("B"), set(("A",)))
+ self.assertEqual(set([row[1] for row in db._db_execute("PRAGMA index_list(GROUPS)")]), set(("GROUPNAMES", "MEMBERS")))
+ db._db_close()
+ db = None
+
\ No newline at end of file
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080523/c51c03fc/attachment-0001.htm
More information about the calendarserver-changes
mailing list