added more tests for records

diff --git a/tests/testHierarchy.py b/tests/testHierarchy.py
index a094af0..5262009 100644 (file)
--- a/tests/testHierarchy.py
+++ b/tests/testHierarchy.py
@@ -17,23 +17,27 @@ class TestHierarchy(unittest.TestCase):
     def testGetAuthInfo(self):
         h = Hierarchy(BASEDIR)
 
-        auth_info = h.get_auth_info("planetlab.us.arizona.stork", "sa", can_create=True)
+        name = "planetlab.us.arizona.stork"
+
+        self.assertEqual(h.auth_exists(name), False)
+
+        auth_info = h.get_auth_info(name, can_create=True)
         self.assert_(auth_info)
 
         gid = auth_info.get_gid_object()
         self.assert_(gid)
-        self.assertEqual(gid.get_subject(), "planetlab.us.arizona.stork")
+        self.assertEqual(gid.get_subject(), name)
 
         pubkey = auth_info.get_pkey_object()
         self.assert_(gid)
 
         # try to get it again, make sure it's still there
-        auth_info2 = h.get_auth_info("planetlab.us.arizona.stork", "sa", can_create=False)
+        auth_info2 = h.get_auth_info(name, can_create=False)
         self.assert_(auth_info2)
 
         gid = auth_info2.get_gid_object()
         self.assert_(gid)
-        self.assertEqual(gid.get_subject(), "planetlab.us.arizona.stork")
+        self.assertEqual(gid.get_subject(), name)
 
         pubkey = auth_info2.get_pkey_object()
         self.assert_(gid)

diff --git a/tests/testRecord.py b/tests/testRecord.py
index 513f95a..35544ed 100644 (file)
--- a/tests/testRecord.py
+++ b/tests/testRecord.py
@@ -18,6 +18,7 @@ class TestTable(unittest.TestCase):
         set_geni_table_prefix("testRecord$")
         self.reg_hrn = "test.table"
         self.rec_hrn = self.reg_hrn + "." + "record"
+        self.rec2_hrn = self.reg_hrn + "." + "record2"
 
     def test000_Purge(self):
         geni_records_purge(get_default_dbinfo())
@@ -30,7 +31,7 @@ class TestTable(unittest.TestCase):
         t = GeniTable(hrn = self.reg_hrn, cninfo=get_default_dbinfo())
 
         k = Keypair(create=True)
-        gid = GID(subject="scott.foo", uuid=create_uuid(), hrn=self.rec_hrn)
+        gid = GID(subject=self.rec_hrn, uuid=create_uuid(), hrn=self.rec_hrn)
         gid.set_pubkey(k)
         gid.set_issuer(key=k, subject=self.rec_hrn)
         gid.encode()
@@ -63,5 +64,44 @@ class TestTable(unittest.TestCase):
         self.assertEqual(r.name, self.rec_hrn)
         self.assertEqual(r.pointer, 4)
 
+    def test005_List(self):
+        t = GeniTable(hrn = self.reg_hrn, cninfo=get_default_dbinfo())
+
+        rec_list = t.list()
+        self.assertEqual(len(rec_list), 1)
+        r = rec_list[0]
+        self.assertEqual(r.name, self.rec_hrn)
+        self.assertEqual(r.pointer, 4)
+
+    def test006_Insert2(self):
+        t = GeniTable(hrn = self.reg_hrn, cninfo=get_default_dbinfo())
+
+        k = Keypair(create=True)
+        gid = GID(subject=self.rec2_hrn, uuid=create_uuid(), hrn=self.rec2_hrn)
+        gid.set_pubkey(k)
+        gid.set_issuer(key=k, subject=self.rec2_hrn)
+        gid.encode()
+        gid.sign()
+
+        r = GeniRecord(name=self.rec2_hrn, gid=gid.save_to_string(), type="user", pointer=222)
+        t.insert(r)
+
+    def test007_List2(self):
+        t = GeniTable(hrn = self.reg_hrn, cninfo=get_default_dbinfo())
+
+        rec_list = t.list()
+        self.assertEqual(len(rec_list), 2)
+
+        found1=False
+        found2=False
+
+        for r in rec_list:
+            if r.name == self.rec_hrn:
+                found1=True
+                self.assertEqual(r.pointer, 4)
+            elif r.name == self.rec2_hrn:
+                found2=True
+                self.assertEqual(r.pointer, 222)
+
 if __name__ == "__main__":
     unittest.main()