gacks handle test case

diff --git a/tests/testAll.py b/tests/testAll.py
index 8e08daf..9990ffc 100644 (file)
--- a/tests/testAll.py
+++ b/tests/testAll.py
@@ -5,7 +5,8 @@ from testCred import *
 from testKeypair import *
 from testMisc import *
 from testHierarchy import *
-#from testRecord import *
+from testRecord import *
+from testTable import *
 
 if __name__ == "__main__":
     unittest.main()

diff --git a/tests/testCert.py b/tests/testCert.py
index 68b3d11..37e468b 100644 (file)
--- a/tests/testCert.py
+++ b/tests/testCert.py
@@ -185,14 +185,14 @@ class TestCert(unittest.TestCase):
       self.assert_(cert2.is_signed_by_cert(cert1))
       self.assert_(cert3.is_signed_by_cert(cert2))
 
-      self.assert_(cert3.verify_chain([cert_root]))
+      cert3.verify_chain([cert_root])
 
       # now save the chain to a string and load it into a new certificate
       str_chain = cert3.save_to_string(save_parents=True)
       cert4 = Certificate(string = str_chain)
 
       # verify the newly loaded chain still verifies
-      self.assert_(cert4.verify_chain([cert_root]))
+      cert4.verify_chain([cert_root])
 
       # verify the parentage
       self.assertEqual(cert4.get_parent().get_subject(), "two")

diff --git a/tests/testGacksHandle.py b/tests/testGacksHandle.py
new file mode 100644 (file)
index 0000000..09b6529
--- /dev/null
+++ b/tests/testGacksHandle.py
@@ -0,0 +1,124 @@
+import unittest
+import xmlrpclib
+from gackshandle import *
+
+class TestGacksHandle(unittest.TestCase):
+   def setUp(self):
+       pass
+
+   def testCreate(self):
+       h = GacksHandle("cpu", 10, 15, 20, 25)
+       self.assertEqual(h.id, "cpu")
+       self.assertEqual(h.unitStart, 10)
+       self.assertEqual(h.unitStop, 15)
+       self.assertEqual(h.timeStart, 20)
+       self.assertEqual(h.timeStop, 25)
+
+   def testAsString(self):
+       h = GacksHandle("cpu", 10, 15, 20, 25)
+       s = h.as_string()
+       self.assertEqual(s, "cpu#10-15#20-25")
+
+   def testLoadFromString(self):
+       h = GacksHandle("cpu", 10, 15, 20, 25)
+       s = h.as_string()
+       h2 = GacksHandle(string=s)
+       self.assertEqual(h.id, h2.id)
+       self.assertEqual(h.unitStart, h2.unitStart)
+       self.assertEqual(h.unitStop, h2.unitStop)
+       self.assertEqual(h.timeStart, h2.timeStart)
+       self.assertEqual(h.timeStop, h2.timeStop)
+
+   def testGetQuantity(self):
+       h = GacksHandle("cpu", 10, 15, 20, 25)
+       self.assertEqual(h.get_quantity(), 5)
+
+   def testGetDuration(self):
+       h = GacksHandle("cpu", 10, 15, 20, 25)
+       self.assertEqual(h.get_duration(), 5)
+
+   def testClone(self):
+       h = GacksHandle("cpu", 10, 15, 20, 25)
+       h2 = h.clone()
+       self.assertEqual(h.id, h2.id)
+       self.assertEqual(h.unitStart, h2.unitStart)
+       self.assertEqual(h.unitStop, h2.unitStop)
+       self.assertEqual(h.timeStart, h2.timeStart)
+       self.assertEqual(h.timeStop, h2.timeStop)
+
+   def testSplit(self):
+       h = GacksHandle("cpu", 10, 15, 20, 25)
+       (h1, h2) = h.split(12,23)
+
+       self.assertEqual(h1.id, "cpu")
+       self.assertEqual(h1.unitStart, 10)
+       self.assertEqual(h1.unitStop, 12)
+       self.assertEqual(h1.timeStart, 20)
+       self.assertEqual(h1.timeStop, 23)
+
+       self.assertEqual(h2.id, "cpu")
+       self.assertEqual(h2.unitStart, 12)
+       self.assertEqual(h2.unitStop, 15)
+       self.assertEqual(h2.timeStart, 23)
+       self.assertEqual(h2.timeStop, 25)
+
+class TestGacksRecord(unittest.TestCase):
+   def setUp(self):
+       pass
+
+   def testCreate(self):
+       r = GacksRecord("cpu", 10, 15, 20, 25, ["foo","bar"], "slice1")
+       self.assertEqual(r.id, "cpu")
+       self.assertEqual(r.unitStart, 10)
+       self.assertEqual(r.unitStop, 15)
+       self.assertEqual(r.timeStart, 20)
+       self.assertEqual(r.timeStop, 25)
+       self.assertEqual(r.allocatorHRNs, ["foo", "bar"])
+       self.assertEqual(r.consumerHRN, "slice1")
+
+   def testClone(self):
+       r = GacksRecord("cpu", 10, 15, 20, 25, ["foo","bar"], "slice1")
+       r2 = r.clone()
+
+       self.assertEqual(r.id, r2.id)
+       self.assertEqual(r.unitStart, r2.unitStart)
+       self.assertEqual(r.unitStop, r2.unitStop)
+       self.assertEqual(r.timeStart, r2.timeStart)
+       self.assertEqual(r.timeStop, r2.timeStop)
+       self.assertEqual(r.allocatorHRNs, r2.allocatorHRNs)
+       self.assertEqual(r.consumerHRN, r2.consumerHRN)
+
+   def testSetAllocator(self):
+       r = GacksRecord("cpu", 10, 15, 20, 25, ["foo","bar"], "slice1")
+       r.set_allocator("bar", "bob", -1, 1)
+       self.assertEqual(r.allocatorHRNs, ["foo", "bar", "bob"])
+
+       r = GacksRecord("cpu", 10, 15, 20, 25, ["foo","bar"], "slice1")
+       r.set_allocator("bar", "bob", -1, 0)
+       self.assertEqual(r.allocatorHRNs, ["foo", "bob"])
+
+       r = GacksRecord("cpu", 10, 15, 20, 25, ["foo","bar","foo","bar"], "slice1")
+       r.set_allocator("bar", "bob", 0, 0)
+       self.assertEqual(r.allocatorHRNs, ["foo", "bob"])
+
+       r = GacksRecord("cpu", 10, 15, 20, 25, ["foo","bar","foo","bar"], "slice1")
+       r.set_allocator("bar", "bob", 1, 0)
+       self.assertEqual(r.allocatorHRNs, ["foo", "bar", "foo", "bob"])
+
+   def testGetAllocator(self):
+       r = GacksRecord("cpu", 10, 15, 20, 25, ["foo","bar"], "slice1")
+       self.assertEqual(r.get_allocators(), ["foo", "bar"])
+
+   def testSetConsumer(self):
+       r = GacksRecord("cpu", 10, 15, 20, 25, ["foo","bar"], "slice1")
+       r.set_consumer("slice2")
+       self.assertEqual(r.get_consumer(), "slice2")
+
+   def testGetConsumer(self):
+       r = GacksRecord("cpu", 10, 15, 20, 25, ["foo","bar"], "slice1")
+       self.assertEqual(r.get_consumer(), "slice1")
+
+
+
+if __name__ == "__main__":
+    unittest.main()

diff --git a/tests/testKeypair.py b/tests/testKeypair.py
index 0f1822a..7ce48e2 100644 (file)
--- a/tests/testKeypair.py
+++ b/tests/testKeypair.py
@@ -2,7 +2,7 @@ import unittest
 import xmlrpclib
 from cert import *
 
-class TestCert(unittest.TestCase):
+class TestKeypair(unittest.TestCase):
    def setUp(self):
       pass
 

diff --git a/tests/testRecord.py b/tests/testRecord.py
index 35544ed..2f83e05 100644 (file)
--- a/tests/testRecord.py
+++ b/tests/testRecord.py
@@ -12,96 +12,5 @@ class TestRecord(unittest.TestCase):
     def testCreate(self):
         r = GeniRecord()
 
-class TestTable(unittest.TestCase):
-
-    def setUp(self):
-        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())
-
-    def test001_Create(self):
-        t = GeniTable(hrn = self.reg_hrn, cninfo=get_default_dbinfo())
-        t.create()
-
-    def test002_Insert(self):
-        t = GeniTable(hrn = self.reg_hrn, cninfo=get_default_dbinfo())
-
-        k = Keypair(create=True)
-        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()
-        gid.sign()
-
-        r = GeniRecord(name=self.rec_hrn, gid=gid.save_to_string(), type="user", pointer=3)
-        t.insert(r)
-
-    def test003_Lookup(self):
-        t = GeniTable(hrn = self.reg_hrn, cninfo=get_default_dbinfo())
-
-        rec_list = t.resolve("*", self.rec_hrn)
-        self.assertEqual(len(rec_list), 1)
-        r = rec_list[0]
-        self.assertEqual(r.name, self.rec_hrn)
-        self.assertEqual(r.pointer, 3)
-
-    def test004_Update(self):
-        t = GeniTable(hrn = self.reg_hrn, cninfo=get_default_dbinfo())
-
-        rec_list = t.resolve("*", self.rec_hrn)
-        r = rec_list[0]
-
-        r.set_pointer(4)
-        t.update(r)
-
-        rec_list = t.resolve("*", self.rec_hrn)
-        self.assertEqual(len(rec_list), 1)
-        r = rec_list[0]
-        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()