WIP almost working. Need to list all the expected entries and check t…

…hem all in a loop
paraita · Jan 25, 2017 · 13acb0f · 13acb0f
1 parent 5b72624
commit 13acb0f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/sophiabus230/__init__.py b/sophiabus230/__init__.py
@@ -37,13 +37,14 @@ def _sanitize_entry(entry, debug=False):
     """
     if debug:
         logging.basicConfig(level=logging.INFO)
-        logging.info("To sanitize: %s", entry)
+        logging.info("To sanitize: |%s|", entry)
     sane_line = re.sub(r"^\s+$", '\n', entry)
     sane_line = re.sub(r"\s+$", '', sane_line)
     sane_line = re.sub(r"^\s+", '', sane_line)
     sane_line.replace(u"é", "e")
     if len(sane_line) > 1:
         return sane_line
+    logging.info('empty entry !')
     return None
 
 
@@ -110,7 +111,7 @@ def get_next_buses(stop_id=1939, bus_id=230, debug=False):
     if len(data) != 0:
         assert len(data) <= 1
         data_230 = data[0].div.get_text()
-        data_230 = data_230.replace("à ", "DELIMITERà ")
+        data_230 = data_230.replace(u"à ", u"DELIMITERà ")
         data_230 = data_230.replace("dans ", "DELIMITERdans ")
         for e in data_230.split('DELIMITER'):
             sane_entry = _sanitize_entry(e, debug)

diff --git a/sophiabus230/tests/test_get_next_buses.py b/sophiabus230/tests/test_get_next_buses.py
@@ -20,16 +20,17 @@ def test_get_next_buses(self, mock_content):
         tz_paris = gettz('Europe/Paris')
         result_list = sophiabus230.get_next_buses(debug=True)
         expected_bus_time = datetime.now(tz=tz_paris) + timedelta(minutes=9)
-        assert len(result_list) == 1
-        actual_dest = result_list[0]['dest']
-        actual_is_real_time = result_list[0]['is_real_time']
-        actual_bus_time = result_list[0]['bus_time']
-        expected_dest = u'Cathédrale-Vieille Ville'
-        expected_is_real_time = True
-        self.assertEqual(actual_dest, expected_dest)
-        assert actual_is_real_time == expected_is_real_time
-        assert actual_bus_time.year == expected_bus_time.year
-        assert actual_bus_time.month == expected_bus_time.month
-        assert actual_bus_time.day == expected_bus_time.day
-        assert actual_bus_time.hour == expected_bus_time.hour
-        assert actual_bus_time.minute == expected_bus_time.minute
+        self.assertEqual(len(result_list), 8)
+        #TODO: add the expected tt's here (look at the logging stuff for the full list)
+        # actual_dest = result_list[0]['dest']
+        # actual_is_real_time = result_list[0]['is_real_time']
+        # actual_bus_time = result_list[0]['bus_time']
+        # expected_dest = u'Cathédrale-Vieille Ville'
+        # expected_is_real_time = True
+        # self.assertEqual(actual_dest, expected_dest)
+        # assert actual_is_real_time == expected_is_real_time
+        # assert actual_bus_time.year == expected_bus_time.year
+        # assert actual_bus_time.month == expected_bus_time.month
+        # assert actual_bus_time.day == expected_bus_time.day
+        # assert actual_bus_time.hour == expected_bus_time.hour
+        # assert actual_bus_time.minute == expected_bus_time.minute