PEP8 improvements.

[philipp/winterrodeln/wrpylib.git] / tests / test_wrmwdb.py

diff --git a/tests/test_wrmwdb.py b/tests/test_wrmwdb.py
index 0c6949d5a125e3f50a21e350f07af425660abda3..c57ef89c6715ce9ddedab5ca5f0d3160bb80a345 100644 (file)
--- a/tests/test_wrmwdb.py
+++ b/tests/test_wrmwdb.py
@@ -1,13 +1,12 @@
-#!/usr/bin/python3.4
 import os
 import unittest
 import sqlalchemy
 from sqlalchemy.engine import create_engine
 from sqlalchemy.orm import sessionmaker
 import wrpylib.wrmwdb
+from wrpylib.wrmwcache import update_wrreportcache
 
-
-TEST_DB = 'mysql://philipp@localhost:3306/philipp_winterrodeln_wrpylib_wrpylib_test?charset=utf8&use_unicode=1'
+TEST_DB = 'mysql://philipp@localhost:3306/philipp_winterrodeln_wrpylib_wrpylib_test?charset=utf8mb4'
 
 
 def setup_test_database():
@@ -16,7 +15,7 @@ def setup_test_database():
     with open(testdb, 'r') as f:
         sql = f.read()
     with engine.begin() as con:
-        con.execute(sql)
+        con.execution_options(no_parameters=True).execute(sql)
 
         # update dates
         seconds_diff, = con.execute("SELECT TIMESTAMPDIFF(SECOND, '2017-03-31 07:00', now())").fetchone()
@@ -68,19 +67,21 @@ class TestWrMwDb(unittest.TestCase):
         self.assertEqual('Meißner_Haus_(Gasthaus)', wrinncache.page_title)
 
     def test_wrreportcache_table(self):
+        update_wrreportcache(self.engine.connect())
         WrReportCache = wrpylib.wrmwdb.wrreportcache_table(self.metadata)
-        wrreport = self.session.query(WrReportCache).filter(WrReportCache.c.page_id==226).first()
-        self.assertEqual(226, wrreport.page_id)
-        self.assertEqual('Axamer Lizum', wrreport.page_title)
+        wrreport = self.session.query(WrReportCache).filter(WrReportCache.c.page_id == 237).first()
+        self.assertEqual(237, wrreport.page_id)
+        self.assertEqual('Gleirschalm', wrreport.page_title)
 
     def test_wrregion_table(self):
         WrRegion = wrpylib.wrmwdb.wrregion_table(self.metadata)
-        wrregion = self.session.query(WrRegion).filter(WrRegion.c.id==18).first()
+        wrregion = self.session.query(WrRegion).filter(WrRegion.c.id == 18).first()
         self.assertEqual(18, wrregion.id)
         self.assertEqual('Salzburg', wrregion.name)
 
     def test_wrregioncache_table(self):
         WrRegionCache = wrpylib.wrmwdb.wrregioncache_table(self.metadata)
-        wrregioncache = self.session.query(WrRegionCache).filter((WrRegionCache.c.region_id==27) & (WrRegionCache.c.page_id==5)).first()
+        wrregioncache = self.session.query(WrRegionCache).filter((WrRegionCache.c.region_id == 27) &
+                                                                 (WrRegionCache.c.page_id == 5)).first()
         self.assertEqual(27, wrregioncache.region_id)
         self.assertEqual(5, wrregioncache.page_id)