X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftest_basics.py;h=0f27f48a2a84a7068b34f2f8b38bbe3db7b72199;hb=7f7b44cb967ae9b99ddcbf3879c92d448570d49c;hp=f886c34d708a77e08b0245c5ac3988c1a6727c07;hpb=1653400a1d07f3433e1f8e10f484de9f88593c3f;p=motion.git
diff --git a/tests/test_basics.py b/tests/test_basics.py
index f886c34..0f27f48 100644
--- a/tests/test_basics.py
+++ b/tests/test_basics.py
@@ -17,7 +17,6 @@ app.config.update(
app.config['TESTING'] = True
app.config['DEBUG'] = False
-
class BasicTest(TestCase):
def init_test(self):
@@ -74,10 +73,36 @@ class BasicTest(TestCase):
+ '\nNo '+str(no)+'
'\
+ '\nAbstain '+str(abstain)+''
-
+ # 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 self.open_DB() as db: