From 89958ec0ff2bce597cc9eba997c0283fd7f3bbbf Mon Sep 17 00:00:00 2001 From: miro Date: Sun, 17 Nov 2024 14:20:09 +0000 Subject: [PATCH 1/2] fix: skilljson --- locale/en-us/skill.json | 8 ++++++ test/test_plugin.py | 13 +++++++++ test/test_skill_loading.py | 54 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+) create mode 100644 locale/en-us/skill.json create mode 100644 test/test_plugin.py create mode 100644 test/test_skill_loading.py diff --git a/locale/en-us/skill.json b/locale/en-us/skill.json new file mode 100644 index 0000000..898af4f --- /dev/null +++ b/locale/en-us/skill.json @@ -0,0 +1,8 @@ +{ + "name": "SomaFM Skill", + "examples": [ + "play soma fm radio", + "play secret agent", + "play metal detector" + ] +} diff --git a/test/test_plugin.py b/test/test_plugin.py new file mode 100644 index 0000000..a30121e --- /dev/null +++ b/test/test_plugin.py @@ -0,0 +1,13 @@ +import unittest +from ovos_plugin_manager.skills import find_skill_plugins + + +class TestPlugin(unittest.TestCase): + @classmethod + def setUpClass(self): + self.skill_id = "ovos-skill-confucius-quotes.openvoiceos" + + def test_find_plugin(self): + plugins = find_skill_plugins() + self.assertIn(self.skill_id, list(plugins)) + diff --git a/test/test_skill_loading.py b/test/test_skill_loading.py new file mode 100644 index 0000000..d414b61 --- /dev/null +++ b/test/test_skill_loading.py @@ -0,0 +1,54 @@ +import unittest +from os.path import dirname + +from ovos_plugin_manager.skills import find_skill_plugins +from ovos_utils.messagebus import FakeBus +from ovos_workshop.skill_launcher import PluginSkillLoader, SkillLoader +from ovos_skill_confucius_quotes import ConfuciusQuotesSkill + + +class TestSkillLoading(unittest.TestCase): + @classmethod + def setUpClass(self): + self.skill_id = "ovos-skill-confucius-quotes.openvoiceos" + self.path = dirname(dirname(__file__)) + + def test_from_class(self): + bus = FakeBus() + skill = ConfuciusQuotesSkill() + skill._startup(bus, self.skill_id) + self.assertEqual(skill.bus, bus) + self.assertEqual(skill.skill_id, self.skill_id) + + def test_from_plugin(self): + bus = FakeBus() + for skill_id, plug in find_skill_plugins().items(): + if skill_id == self.skill_id: + skill = plug() + skill._startup(bus, self.skill_id) + self.assertEqual(skill.bus, bus) + self.assertEqual(skill.skill_id, self.skill_id) + break + else: + raise RuntimeError("plugin not found") + + def test_from_loader(self): + bus = FakeBus() + loader = SkillLoader(bus, self.path) + loader.load() + self.assertEqual(loader.instance.bus, bus) + self.assertEqual(loader.instance.root_dir, self.path) + + def test_from_plugin_loader(self): + bus = FakeBus() + loader = PluginSkillLoader(bus, self.skill_id) + for skill_id, plug in find_skill_plugins().items(): + if skill_id == self.skill_id: + loader.load(plug) + break + else: + raise RuntimeError("plugin not found") + + self.assertEqual(loader.skill_id, self.skill_id) + self.assertEqual(loader.instance.bus, bus) + self.assertEqual(loader.instance.skill_id, self.skill_id) From e9aa5b9afbb9906c406a437fd5bca32d7582944b Mon Sep 17 00:00:00 2001 From: miro Date: Sun, 17 Nov 2024 14:21:16 +0000 Subject: [PATCH 2/2] fix: skilljson --- test/test_plugin.py | 13 --------- test/test_skill_loading.py | 54 -------------------------------------- 2 files changed, 67 deletions(-) delete mode 100644 test/test_plugin.py delete mode 100644 test/test_skill_loading.py diff --git a/test/test_plugin.py b/test/test_plugin.py deleted file mode 100644 index a30121e..0000000 --- a/test/test_plugin.py +++ /dev/null @@ -1,13 +0,0 @@ -import unittest -from ovos_plugin_manager.skills import find_skill_plugins - - -class TestPlugin(unittest.TestCase): - @classmethod - def setUpClass(self): - self.skill_id = "ovos-skill-confucius-quotes.openvoiceos" - - def test_find_plugin(self): - plugins = find_skill_plugins() - self.assertIn(self.skill_id, list(plugins)) - diff --git a/test/test_skill_loading.py b/test/test_skill_loading.py deleted file mode 100644 index d414b61..0000000 --- a/test/test_skill_loading.py +++ /dev/null @@ -1,54 +0,0 @@ -import unittest -from os.path import dirname - -from ovos_plugin_manager.skills import find_skill_plugins -from ovos_utils.messagebus import FakeBus -from ovos_workshop.skill_launcher import PluginSkillLoader, SkillLoader -from ovos_skill_confucius_quotes import ConfuciusQuotesSkill - - -class TestSkillLoading(unittest.TestCase): - @classmethod - def setUpClass(self): - self.skill_id = "ovos-skill-confucius-quotes.openvoiceos" - self.path = dirname(dirname(__file__)) - - def test_from_class(self): - bus = FakeBus() - skill = ConfuciusQuotesSkill() - skill._startup(bus, self.skill_id) - self.assertEqual(skill.bus, bus) - self.assertEqual(skill.skill_id, self.skill_id) - - def test_from_plugin(self): - bus = FakeBus() - for skill_id, plug in find_skill_plugins().items(): - if skill_id == self.skill_id: - skill = plug() - skill._startup(bus, self.skill_id) - self.assertEqual(skill.bus, bus) - self.assertEqual(skill.skill_id, self.skill_id) - break - else: - raise RuntimeError("plugin not found") - - def test_from_loader(self): - bus = FakeBus() - loader = SkillLoader(bus, self.path) - loader.load() - self.assertEqual(loader.instance.bus, bus) - self.assertEqual(loader.instance.root_dir, self.path) - - def test_from_plugin_loader(self): - bus = FakeBus() - loader = PluginSkillLoader(bus, self.skill_id) - for skill_id, plug in find_skill_plugins().items(): - if skill_id == self.skill_id: - loader.load(plug) - break - else: - raise RuntimeError("plugin not found") - - self.assertEqual(loader.skill_id, self.skill_id) - self.assertEqual(loader.instance.bus, bus) - self.assertEqual(loader.instance.skill_id, self.skill_id)