[subversion:7] 8 tests, 2 OK

[esimorre@kenai.com]

Repository: subversion
Revision:   7
Author:     esimorre
Date:       2008-10-04 13:32:11 UTC

Log Message:
-----------
8 tests, 2 OK

Modified Paths:
--------------
    tracdb_ext/tests.py

Added Paths:
-----------
    tracdb_ext/sql/permission.sqltracdb_ext/sql

Diffs:
-----
Index: tracdb_ext/sql/permission.sql
===================================================================
--- tracdb_ext/sql/permission.sql       (revision 0)
+++ tracdb_ext/sql/permission.sql       (revision 7)
@@ -0,0 +1,22 @@
+DROP TABLE IF EXISTS "permission";
+CREATE TABLE permission (
+    username text,
+    action text,
+    UNIQUE (username,action)
+);
+INSERT INTO "permission" VALUES('anonymous','LOG_VIEW');
+INSERT INTO "permission" VALUES('anonymous','FILE_VIEW');
+INSERT INTO "permission" VALUES('anonymous','WIKI_VIEW');
+INSERT INTO "permission" VALUES('authenticated','WIKI_CREATE');
+INSERT INTO "permission" VALUES('authenticated','WIKI_MODIFY');
+INSERT INTO "permission" VALUES('anonymous','SEARCH_VIEW');
+INSERT INTO "permission" VALUES('anonymous','REPORT_VIEW');
+INSERT INTO "permission" VALUES('anonymous','REPORT_SQL_VIEW');
+INSERT INTO "permission" VALUES('anonymous','TICKET_VIEW');
+INSERT INTO "permission" VALUES('authenticated','TICKET_CREATE');
+INSERT INTO "permission" VALUES('authenticated','TICKET_MODIFY');
+INSERT INTO "permission" VALUES('anonymous','BROWSER_VIEW');
+INSERT INTO "permission" VALUES('anonymous','TIMELINE_VIEW');
+INSERT INTO "permission" VALUES('anonymous','CHANGESET_VIEW');
+INSERT INTO "permission" VALUES('anonymous','ROADMAP_VIEW');
+INSERT INTO "permission" VALUES('anonymous','MILESTONE_VIEW');
Index: tracdb_ext/tests.py
===================================================================
--- tracdb_ext/tests.py (revision 6)
+++ tracdb_ext/tests.py (revision 7)
@@ -1,9 +1,15 @@
 import unittest
 #from django.test.client import Client
-from models import Permission1
+from models import Permission1, Permission
 
 class TestCmpPKModel(unittest.TestCase):
-    def test_CmpPKModel_create(self):
+    def test_get(self):
+        '''works
+        '''
+        p=Permission1.objects.get(pk='authenticated,WIKI_CREATE')
+        self.assertTrue(p.pk != None)
+
+    def test_create(self):
         Permission1.objects.filter(username='paul').delete()
         
         p1 = Permission1(username='paul', action='can_draw')
@@ -15,7 +21,7 @@
         
         Permission1.objects.filter(username='paul').delete()
         
-    def test_CmpPKModel_delete(self):
+    def test_delete(self):
         Permission1.objects.filter(username='paul').delete()
         
         p1 = Permission1(username='paul', action='can_draw')
@@ -32,7 +38,7 @@
        
self.assertEquals(Permission1.objects.filter(username='paul').count(),
                           0)
         
-    def test_CmpPKModel_update(self):
+    def test_update(self):
         Permission1.objects.filter(username='paul').delete()
         
         p1 = Permission1(username='paul', action='can_draw')
@@ -51,19 +57,29 @@
 
 
 class TestOIDModel(unittest.TestCase):
-    def test_CmpPKModel_create(self):
+    def test_get(self):
+        '''works
+        '''
+       
self.assertEquals(Permission.objects.filter(username='authenticated').c
ount(), 4)
+        self.assertEquals(Permission.objects.get(pk=1),
+                          Permission.objects.get(oid=1))
+        p = Permission.objects.all()[0]
+        self.assertTrue(p.pk != None)
+        self.assertTrue(p.oid != None)
+        
+    def test_create(self):
         Permission.objects.filter(username='paul').delete()
         
         p1 = Permission(username='paul', action='can_draw')
         p1.save()
         
-        p1b = Permission.objects.get(pk='paul,can_draw')
+        p1b = Permission.objects.get(pk=p1.oid)
         self.assertEquals(p1b.username, 'paul')
         self.assertEquals(p1b.action, 'can_draw')
         
         Permission.objects.filter(username='paul').delete()
         
-    def test_CmpPKModel_delete(self):
+    def test_delete(self):
         Permission.objects.filter(username='paul').delete()
         
         p1 = Permission(username='paul', action='can_draw')
@@ -80,7 +96,7 @@
        
self.assertEquals(Permission.objects.filter(username='paul').count(),
                           0)
         
-    def test_CmpPKModel_update(self):
+    def test_update(self):
         Permission.objects.filter(username='paul').delete()
         
         p1 = Permission(username='paul', action='can_draw')
@@ -89,12 +105,11 @@
         p2.save()
         
         p1.action = 'should_draw'
-        p1.save(force_insert=True)
+        p1.save()
        
self.assertEquals(Permission.objects.filter(username='paul').count(),
                           3)
         p1.action = 'must_draw'
-        p1.save(force_update=True)
+        p1.save()
        
self.assertEquals(Permission.objects.filter(username='paul').count(),
                           3)
 
-