more gacks tests

diff --git a/tests/testGacksHandle.py b/tests/testGacksHandle.py
index a792cf3..3e26612 100644 (file)
--- a/tests/testGacksHandle.py
+++ b/tests/testGacksHandle.py
@@ -111,6 +111,18 @@ class TestGacksHandle(unittest.TestCase):
        self.assert_(find_handle_in_list(parts, 12, 15, 20, 22)) # h2
        self.assert_(find_handle_in_list(parts, 12, 15, 22, 25)) # s
 
+   def testDict(self):
+       h = GacksHandle("cpu", 10, 15, 20, 25)
+       d = h.as_dict()
+
+       h2 = GacksHandle(dict = d)
+       
+       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)
+
 class TestGacksRecord(unittest.TestCase):
    def setUp(self):
        pass
@@ -167,6 +179,20 @@ class TestGacksRecord(unittest.TestCase):
        r = GacksRecord("cpu", 10, 15, 20, 25, ["foo","bar"], "slice1")
        self.assertEqual(r.get_consumer(), "slice1")
 
+   def testTestDict(self):
+       r = GacksRecord("cpu", 10, 15, 20, 25, ["foo","bar"], "slice1")
+       d = r.as_dict()
+
+       r2 = GacksRecord(dict=d)
+
+       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)
+
 
 
 if __name__ == "__main__":

diff --git a/tests/testGacksReceipt.py b/tests/testGacksReceipt.py
new file mode 100644 (file)
index 0000000..7a3fdb0
--- /dev/null
+++ b/tests/testGacksReceipt.py
@@ -0,0 +1,70 @@
+import unittest
+import xmlrpclib
+from gacksreceipt import *
+
+class TestGacksReceipt(unittest.TestCase):
+   def setUp(self):
+       pass
+
+   def testCreate(self):
+       h = GacksHandle("cpu", 10, 15, 20, 25)
+       r = GacksReceipt(subject="foo1", handle = h, action="foo")
+       self.assertEqual(r.handle, h)
+       self.assertEqual(r.action, "foo")
+
+   def testSetHandle(self):
+       h = GacksHandle("cpu", 10, 15, 20, 25)
+       r = GacksReceipt(subject="foo1", handle = h)
+       self.assertEqual(r.handle, h)
+
+       h2 = GacksHandle("cpu", 10, 15, 20, 25)
+       r.SetHandle(h2);
+       self.assertEqual(r.handle, h2)
+
+   def testSetAction(self):
+       h = GacksHandle("cpu", 10, 15, 20, 25)
+       r = GacksReceipt(subject="foo1", handle = h, action="foo")
+       self.assertEqual(r.action, "foo")
+
+       r.SetAction("bar");
+       self.assertEqual(r.action, "bar")
+
+   def testEncodeDecode(self):
+       h = GacksHandle("cpu", 10, 15, 20, 25)
+       rec1 = GacksRecord("cpu", 10, 13, 20, 25, ["aaa","bbb"], "slice1")
+       rec2 = GacksRecord("cpu", 13, 15, 20, 25, ["aaa","bbb"], "slice1")
+       r = GacksReceipt(subject="foo1", handle = h, action="foo", reclist=[rec1,rec2])
+
+       r.encode()
+
+       str = r.save_to_string()
+
+       r2 = GacksReceipt(string = str)
+       #r2.decode()
+       #r2.dump()
+
+       h2 = r2.GetHandle()
+       self.assertEqual(h2.id, "cpu")
+       self.assertEqual(h2.unitStart, 10)
+       self.assertEqual(h2.unitStop, 15)
+       self.assertEqual(h2.timeStart, 20)
+       self.assertEqual(h2.timeStop, 25)
+
+       self.assertEqual(r2.GetAction(), "foo")
+
+       reclist = r2.GetRecords()
+       r1=reclist[0]
+       r2=reclist[1]
+       self.assertEqual(r1.id, "cpu")
+       self.assertEqual(r1.unitStart, 10)
+       self.assertEqual(r1.unitStop, 13)
+       self.assertEqual(r1.timeStart, 20)
+       self.assertEqual(r1.timeStop, 25)
+       self.assertEqual(r2.id, "cpu")
+       self.assertEqual(r2.unitStart, 13)
+       self.assertEqual(r2.unitStop, 15)
+       self.assertEqual(r2.timeStart, 20)
+       self.assertEqual(r2.timeStop, 25)
+
+if __name__ == "__main__":
+    unittest.main()