X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Ftest_basics.py;h=85dc7b6690bc90ddca4e264cbf27fa604907c911;hb=11e82f491ae15d3b7d9f1f88db2ab79d1fe131bf;hp=9385095a03d447c9d6cbf2578798380aff22c254;hpb=f87b033c4ef50f5dc3a20e28083339cf2bab29d8;p=motion.git

diff --git a/tests/test_basics.py b/tests/test_basics.py
index 9385095..85dc7b6 100644
--- a/tests/test_basics.py
+++ b/tests/test_basics.py
@@ -10,6 +10,7 @@ app.config.update(
     GROUP_PREFIX = {'127.0.0.1:5000': {'group1': 'g1', 'group2': 'g2'}},
     DURATION = {'127.0.0.1:5000':[3, 7, 14]},
     SERVER_NAME = '127.0.0.1:5000',
+    DEFAULT_HOST = '127.0.0.1:5000',
     MAX_PROXY=2
 )
 
@@ -33,7 +34,6 @@ class BasicTest(TestCase):
             environ_base={'USER_ROLES': user},
             data=dict(vote=vote)
         )
-        
 
     def createMotion(self, user, motiontitle, motioncontent, days, category):
         return self.app.post(
@@ -74,13 +74,43 @@ class BasicTest(TestCase):
             + '\nNo <span class=\"badge badge-pill badge-secondary\">'+str(no)+'</span><br>'\
             + '\nAbstain <span class=\"badge badge-pill badge-secondary\">'+str(abstain)+'</span>'
 
+    # functions handling or using database
+    def open_DB(self):
+        return postgresql.open(app.config.get("DATABASE"), user=app.config.get("USER"), password=app.config.get("PASSWORD"))
+
+    def db_select(self, sql, parameter):
+        with self.open_DB() as db:
+            rv = db.prepare(sql)(parameter)
+            return rv
+
+    def db_select2(self, sql, parameter, parameter2):
+        with self.open_DB() as db:
+            rv = db.prepare(sql)(parameter, parameter2)
+            return rv
+
+    def recordCountLog(self, parameter):
+        return self.recordCount("SELECT * FROM adminlog WHERE action=$1", parameter)
+
+    def recordCount(self, sql, parameter):
+        rv = self.db_select(sql, parameter)
+        return len(rv)
+
+    def logRecordDetailsTest(self, parameter, recordno, voterid, comment, actionuserid):
+        rv = self.db_select("SELECT * FROM adminlog WHERE action=$1 ORDER BY id", parameter)
+        self.assertEqual(voterid, rv[recordno].get("user_id"))
+        if comment:
+            self.assertEqual(comment, rv[recordno].get("comment"))
+        else:
+            self.assertEqual('', rv[recordno].get("comment"))
+        self.assertEqual(actionuserid, rv[recordno].get("action_user_id"))
+    
     # functions to clear database
     def db_clear(self):
-        with postgresql.open(app.config.get("DATABASE"), user=app.config.get("USER"), password=app.config.get("PASSWORD")) as db:
+        with self.open_DB() as db:
             with app.open_resource('sql/schema.sql', mode='r') as f:
                 db.execute(f.read())
 
     def db_sampledata(self):
-        with postgresql.open(app.config.get("DATABASE"), user=app.config.get("USER"), password=app.config.get("PASSWORD")) as db:
+        with self.open_DB() as db:
             with app.open_resource('sql/sample_data.sql', mode='r') as f:
                 db.execute(f.read())