improve test covorage

willforde · Feb 19, 2018 · 7730460 · 7730460
1 parent 4fe9833
commit 7730460
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/script.module.codequick/lib/codequick/resolver.py b/script.module.codequick/lib/codequick/resolver.py
@@ -222,7 +222,7 @@ def extract_youtube(self, source):
                 source = self.request.get(source, max_age=0).text
             try:
                 video_elem = htmlement.fromstring(source)
-            except RuntimeError:
+            except RuntimeError:  # pragma: no cover
                 return None
 
         # Search for all types of embeded videos
@@ -232,7 +232,7 @@ def extract_youtube(self, source):
 
         for url in video_urls:
             match = re.match(VALID_YOUTUBE_URL, url.get("src"))
-            if match is not None:
+            if match is not None:  # pragma: no branch
                 videoid = match.group(2)
                 return u"plugin://plugin.video.youtube/play/?video_id={}".format(videoid)
 

diff --git a/script.module.codequick/lib/codequick/storage.py b/script.module.codequick/lib/codequick/storage.py
@@ -102,7 +102,7 @@ def __enter__(self):
     def __exit__(self, *_):
         self.close()
 
-    def _serialize(self):
+    def _serialize(self):  # pragma: no cover
         pass
 
 

diff --git a/script.module.codequick/lib/urlquick.py b/script.module.codequick/lib/urlquick.py
@@ -587,7 +587,7 @@ def send_request(conn, req):
 
     def close(self):
         """Close all persistent connections and remove."""
-        for _, pool in self.request_handler.values():
+        for pool in self.request_handler.values():
             for key in list(pool.keys()):
                 conn = pool.pop(key)
                 conn.close()

diff --git a/tests/test_resolver.py b/tests/test_resolver.py
@@ -1,4 +1,5 @@
 import unittest
+import urlquick
 import sys
 
 from addondev.testing import plugin_data, mock_select_dialog
@@ -211,3 +212,22 @@ def test_extract_source_warning(self):
         YDStreamExtractor.mode = 4  # raise warning
         ret = self.resolver.extract_source("url")
         self.assertEqual(ret, "video.mkv")
+
+    def test_extract_youtube_url(self):
+        ret = self.resolver.extract_youtube("https://www.watchmojo.com/video/id/20838/")
+        self.assertEqual(ret, "plugin://plugin.video.youtube/play/?video_id=P3PvFiCibts")
+
+    def test_extract_youtube_source(self):
+        source = urlquick.get("https://www.watchmojo.com/video/id/20838/").text
+        ret = self.resolver.extract_youtube(source)
+        self.assertEqual(ret, "plugin://plugin.video.youtube/play/?video_id=P3PvFiCibts")
+
+    def test_extract_youtube_node(self):
+        html = urlquick.get("https://www.watchmojo.com/video/id/20838/")
+        video_elem = html.parse("div", attrs={"id": "question"})
+        ret = self.resolver.extract_youtube(video_elem)
+        self.assertEqual(ret, "plugin://plugin.video.youtube/play/?video_id=P3PvFiCibts")
+
+    def test_extract_youtube_no_video(self):
+        ret = self.resolver.extract_youtube("https://www.youtube.com/")
+        self.assertIsNone(ret)