fix test after last fix

Author: willforde

tests/test_listing.py

@@ -294,32 +294,32 @@ def test_container(self):
         label, command = self.base[0]
 
         self.assertEqual(label, "test label")
-        self.assertEqual(command, "XBMC.Container.Update(plugin://script.module.codequick/"
-                                  "tests/test_listing/test_callback)")
+        self.assertEqual("XBMC.Container.Update(plugin://script.module.codequick/tests/test_listing/test_callback/)",
+                         command)
 
     def test_container_with_params(self):
         self.base.container(self.test_callback, "test label", True, url="tester")
         label, command = self.base[0]
 
         self.assertEqual(label, "test label")
         self.assertTrue(command.startswith("XBMC.Container.Update(plugin://script.module.codequick/"
-                                           "tests/test_listing/test_callback?_pickle_="))
+                                           "tests/test_listing/test_callback/?_pickle_="))
 
     def test_script(self):
         self.base.script(self.test_callback, "test label")
         label, command = self.base[0]
 
         self.assertEqual(label, "test label")
-        self.assertEqual(command, "XBMC.RunPlugin(plugin://script.module.codequick/"
-                                  "tests/test_listing/test_callback)")
+        self.assertEqual("XBMC.RunPlugin(plugin://script.module.codequick/tests/test_listing/test_callback/)",
+                         command)
 
     def test_script_with_params(self):
         self.base.script(self.test_callback, "test label", True, url="tester")
         label, command = self.base[0]
 
         self.assertEqual(label, "test label")
         self.assertTrue(command.startswith("XBMC.RunPlugin(plugin://script.module.codequick/"
-                                           "tests/test_listing/test_callback?_pickle_="))
+                                           "tests/test_listing/test_callback/?_pickle_="))
 
     @unittest.skipIf(PY3, "only work under python 2")
     def test_related_py2(self):
@@ -328,7 +328,7 @@ def test_related_py2(self):
 
         self.assertEqual(label, "Related Videos")
         self.assertEqual(command, "XBMC.Container.Update(plugin://script.module.codequick/tests/test_listing/"
-                                  "test_callback?_pickle_=80027d710155075f7469746c655f7102580e00000052656c617"
+                                  "test_callback/?_pickle_=80027d710155075f7469746c655f7102580e00000052656c617"
                                   "4656420566964656f737103732e)")
 
     @unittest.skipUnless(PY3, "only work under python 3")
@@ -338,7 +338,7 @@ def test_related_py3(self):
 
         self.assertEqual(label, "Related Videos")
         self.assertEqual(command, "XBMC.Container.Update(plugin://script.module.codequick/tests/test_listing/"
-                                  "test_callback?_pickle_=8004951f000000000000007d948c075f746974"
+                                  "test_callback/?_pickle_=8004951f000000000000007d948c075f746974"
                                   "6c655f948c0e52656c6174656420566964656f7394732e)")
 
     def test_related_with_params(self):
@@ -347,7 +347,7 @@ def test_related_with_params(self):
 
         self.assertEqual(label, "Related Videos")
         self.assertTrue(command.startswith("XBMC.Container.Update(plugin://script.module.codequick/"
-                                           "tests/test_listing/test_callback?_pickle_="))
+                                           "tests/test_listing/test_callback/?_pickle_="))
 
     def test_close(self):
         self.base.related(self.test_callback)
@@ -406,7 +406,7 @@ def test_callback_args(self):
     def test_close_route(self):
         self.listitem.set_callback(self.route_callback)
         path, raw_listitem, isfolder = self.listitem._close()
-        self.assertEqual(path, "plugin://script.module.codequick/tests/test_listing/route_callback")
+        self.assertEqual("plugin://script.module.codequick/tests/test_listing/route_callback/", path)
         self.assertTrue(isfolder)
 
     def test_close_no_callback(self):
@@ -417,13 +417,13 @@ def test_close_no_callback(self):
     def test_close_route_params(self):
         self.listitem.set_callback(self.route_callback, "yes", full=True)
         path, raw_listitem, isfolder = self.listitem._close()
-        self.assertTrue(path.startswith("plugin://script.module.codequick/tests/test_listing/route_callback?_pickle_="))
+        self.assertTrue(path.startswith("plugin://script.module.codequick/tests/test_listing/route_callback/?_pickle_="))
         self.assertTrue(isfolder)
 
     def test_close_resolver(self):
         self.listitem.set_callback(self.resolver_callback)
         path, raw_listitem, isfolder = self.listitem._close()
-        self.assertEqual(path, "plugin://script.module.codequick/tests/test_listing/resolver_callback")
+        self.assertEqual("plugin://script.module.codequick/tests/test_listing/resolver_callback/", path)
         self.assertFalse(isfolder)
 
     def test_close_url(self):

tests/test_support.py

@@ -258,22 +258,22 @@ def tearDown(self):
 
     def test_build_path_no_args(self):
         ret = support.build_path()
-        self.assertEqual(ret, "plugin://script.module.codequick/root")
+        self.assertEqual(ret, "plugin://script.module.codequick/root/")
 
     def test_build_new_path(self):
         ret = support.build_path(self.callback)
-        self.assertEqual(ret, "plugin://script.module.codequick/root")
+        self.assertEqual(ret, "plugin://script.module.codequick/root/")
 
     @unittest.skipIf(PY3, "The pickled string is specific to python 2")
     def test_build_path_new_args_py2(self):
         ret = support.build_path(self.callback, query={"testdata": "data"})
-        self.assertEqual("plugin://script.module.codequick/root?_pickle_="
+        self.assertEqual("plugin://script.module.codequick/root/?_pickle_="
                          "80027d71015508746573746461746171025504646174617103732e", ret)
 
     @unittest.skipUnless(PY3, "The pickled string is specific to python 2")
     def test_build_path_new_args_py3(self):
         ret = support.build_path(self.callback, query={"testdata": "data"})
-        self.assertEqual("plugin://script.module.codequick/root?_pickle_="
+        self.assertEqual("plugin://script.module.codequick/root/?_pickle_="
                          "80049516000000000000007d948c08746573746461746194"
                          "8c046461746194732e", ret)
 
@@ -282,7 +282,7 @@ def test_build_path_extra_args_py2(self):
         support.dispatcher.params["_title_"] = "video"
         try:
             ret = support.build_path(self.callback, testdata="data")
-            self.assertEqual("plugin://script.module.codequick/root?_pickle_="
+            self.assertEqual("plugin://script.module.codequick/root/?_pickle_="
                              "80027d71012855075f7469746c655f71025505766964656"
                              "f71035508746573746461746171045504646174617105752e", ret)
         finally:
@@ -293,7 +293,7 @@ def test_build_path_extra_args_py3(self):
         support.dispatcher.params["_title_"] = "video"
         try:
             ret = support.build_path(self.callback, testdata="data")
-            self.assertEqual("plugin://script.module.codequick/root?_pickle_="
+            self.assertEqual("plugin://script.module.codequick/root/?_pickle_="
                              "80049529000000000000007d94288c075f7469746c655f94"
                              "8c05766964656f948c087465737464617461948c046461746194752e", ret)
         finally: