X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2FtestRecord.py;h=0eff8e84650bb7844343fb194bfec1b2984c0afe;hb=db88e8be755e4a4c17fcd65eec98ca420eff91a4;hp=35544ed471e8ad2e0eae54fd6894247c4d535474;hpb=985754e6e57e91aa5b196c0d3ab17bd333cc9164;p=sfa.git

diff --git a/tests/testRecord.py b/tests/testRecord.py
old mode 100644
new mode 100755
index 35544ed4..0eff8e84
--- a/tests/testRecord.py
+++ b/tests/testRecord.py
@@ -1,107 +1,15 @@
 import unittest
 import xmlrpclib
-from record import *
-from cert import *
-from gid import *
-from config import *
+from sfa.trust.gid import *
+from sfa.util.config import *
+from sfa.util.record import *
 
 class TestRecord(unittest.TestCase):
     def setUp(self):
         pass
 
     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)
+        r = SfaRecord()
 
 if __name__ == "__main__":
     unittest.main()