[Greater-commits] r293 - trunk/GREAT-ER-DB/impl/postgresql/test

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-06-28 17:20:52 +0200 (Tue, 28 Jun 2011)
New Revision: 293

Modified:
   trunk/GREAT-ER-DB/impl/postgresql/test/test_pg_p_bin_obj.py
Log:
Add test that compares bin_objs after they went through dagreater


Modified: trunk/GREAT-ER-DB/impl/postgresql/test/test_pg_p_bin_obj.py
===================================================================
--- trunk/GREAT-ER-DB/impl/postgresql/test/test_pg_p_bin_obj.py	2011-06-28 13:58:30 UTC (rev 292)
+++ trunk/GREAT-ER-DB/impl/postgresql/test/test_pg_p_bin_obj.py	2011-06-28 15:20:52 UTC (rev 293)
@@ -51,7 +51,7 @@
     def test_0_insert_bin_obj(self):
         filename = os.path.abspath(os.path.join("data", "itterrivernet.dbf"))
         filesize = os.stat(filename)[ST_SIZE]
-        f        = open(filename, 'r')
+        f        = open(filename, 'rb')
         buffer   = f.read()
         bin_obj_record = DA_S_bin_obj({'bin_obj_id':0,'object_id':2,'name':filename,'user_id':'anonym','privs':6,'obj_type':'CATCHMENT','obj_sub_type':'RIVERNET','file_type':'DBF','file_obj':buffer,'file_size':filesize,'cre_date':'30-11-2003','mod_date':'29-11-2003','write':'2','remark':'remark_string here!'})
         self.res = da_insert_bin_obj(bin_obj_record)
@@ -84,17 +84,32 @@
         self.res = da_get_bin_obj(1,"catchment",205,"Y")
         self.assertEquals(len(self.res),0)
 
-    def test_3_update_bin_obj(self):
+    def test_3_compare_bin_obj(self):
+        import hashlib
+        filename = os.path.abspath(os.path.join("data", "itterrivernet.dbf"))
+        f        = open(filename, 'rb')
+        original = f.read()
+        orig_hash = hashlib.md5()
+        orig_hash.update(original)
+        res = da_get_bin_obj(2,"CATCHMENT",202,"Y")[0]
+        res_hash = hashlib.md5()
+        res_hash.update(res.file_obj)
+        f = open("after.dbf", "wb")
+        f.write(res.file_obj)
+        f.close()
+        self.assertEquals(res_hash.digest(), orig_hash.digest())
+
+    def test_4_update_bin_obj(self):
         self.res = da_get_bin_obj(1,"catchment",201,"Y")
-        print self.res[0].name
+#        print self.res[0].name
         self.res[0].name = "irgendeinName"
-        print self.res[0].name
+#        print self.res[0].name
         self.res = da_update_bin_obj(self.res[0])
         self.res = da_get_bin_obj(1,"catchment",201,"Y")
-        print self.res[0].name
+#        print self.res[0].name
         self.assertNotEquals(len(self.res),0)
 
-    def test_4_delete_bin_obj(self):
+    def test_5_delete_bin_obj(self):
         self.res = da_get_bin_obj(1,"catchment",201,"Y")
         self.assertNotEquals(len(self.res),0)
         self.res = da_delete_bin_obj(201) 
@@ -102,6 +117,7 @@
         self.res = da_get_bin_obj(1,"catchment",201,"Y")
         self.assertEquals(len(self.res),0)
 
+
     def tearDown(self):
         da_db_disconnect()