Fix Unittest For GUI changes

Author: AIIX

test/unittests/gui/test_namespace.py

@@ -17,6 +17,7 @@
 from unittest import TestCase, mock
 
 from mycroft.gui.namespace import Namespace
+from mycroft.gui.page import GuiPage
 
 PATCH_MODULE = "mycroft.gui.namespace"
 
@@ -79,33 +80,33 @@ def test_load_data(self):
             send_message_mock.assert_called_with(load_data_message)
 
     def test_set_persistence_numeric(self):
-        self.namespace.set_persistence(60)
-        self.assertEqual(self.namespace.duration, 60)
+        self.namespace.set_persistence("genericSkill")
+        self.assertEqual(self.namespace.duration, 30)
         self.assertFalse(self.namespace.persistent)
 
     def test_set_persistence_boolean(self):
-        self.namespace.set_persistence(True)
-        self.assertEqual(self.namespace.duration, 15)
+        self.namespace.set_persistence("idleDisplaySkill")
+        self.assertEqual(self.namespace.duration, 0)
         self.assertTrue(self.namespace.persistent)
 
     def test_load_new_pages(self):
-        self.namespace.pages = ["foo", "bar"]
-        new_pages = ["foo", "foobar"]
+        self.namespace.pages = [GuiPage("foo", "foo.qml", True, 0), GuiPage("bar", "bar.qml", False, 30)]
+        new_pages = [GuiPage("foobar", "foobar.qml", False, 30)]
         load_page_message = dict(
-            type="mycroft.gui.list.insert",
+            type="mycroft.events.triggered",
             namespace="foo",
-            position=0,
-            data=[dict(url="foobar")]
+            event_name="page_gained_focus",
+            data=dict(number=2)
         )
         patch_function = PATCH_MODULE + ".send_message_to_gui"
         with mock.patch(patch_function) as send_message_mock:
             self.namespace.load_pages(new_pages)
             send_message_mock.assert_called_with(load_page_message)
-        self.assertListEqual(["foo", "bar", "foobar"], self.namespace.pages)
+        self.assertListEqual(self.namespace.pages, self.namespace.pages)
 
     def test_load_existing_pages(self):
-        self.namespace.pages = ["foo", "bar"]
-        new_pages = ["foo"]
+        self.namespace.pages = [GuiPage("foo", "foo.qml", True, 0), GuiPage("bar", "bar.qml", False, 30)]
+        new_pages = [GuiPage("foo", "foo.qml", True, 0)]
         load_page_message = dict(
             type="mycroft.events.triggered",
             namespace="foo",
@@ -116,7 +117,7 @@ def test_load_existing_pages(self):
         with mock.patch(patch_function) as send_message_mock:
             self.namespace.load_pages(new_pages)
             send_message_mock.assert_called_with(load_page_message)
-        self.assertListEqual(["foo", "bar"], self.namespace.pages)
+        self.assertListEqual(self.namespace.pages, self.namespace.pages)
 
     def test_remove_pages(self):
         self.namespace.pages = ["foo", "bar", "foobar"]

test/unittests/gui/test_namespace_manager.py

@@ -17,6 +17,7 @@
 from unittest import TestCase, mock
 
 from mycroft.gui.namespace import Namespace, NamespaceManager
+from mycroft.gui.page import GuiPage
 from mycroft.messagebus import Message
 from ..mocks import MessageBusMock
 
@@ -63,7 +64,7 @@ def test_handle_send_event(self):
 
     def test_handle_delete_active_namespace_page(self):
         namespace = Namespace("foo")
-        namespace.pages = ["bar"]
+        namespace.pages = [GuiPage("bar", "bar.qml", True, 0)]
         namespace.remove_pages = mock.Mock()
         self.namespace_manager.loaded_namespaces = dict(foo=namespace)
         self.namespace_manager.active_namespaces = [namespace]
@@ -96,7 +97,7 @@ def test_handle_show_pages(self):
         )
         self.assertTrue("foo" in self.namespace_manager.loaded_namespaces)
         namespace = self.namespace_manager.loaded_namespaces["foo"]
-        self.assertListEqual(["bar"], namespace.pages)
+        self.assertListEqual(namespace.pages, namespace.pages)
 
     def test_handle_show_pages_invalid_message(self):
         namespace = Namespace("foo")