From 67b0b866597835cf808ec454a556e8a5a9e80494 Mon Sep 17 00:00:00 2001
From: JarbasAI <33701864+JarbasAl@users.noreply.github.com>
Date: Fri, 29 Dec 2023 13:58:14 +0000
Subject: [PATCH 1/2] port unittests from workshop

---
 test/unittests/test_skills.py | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/test/unittests/test_skills.py b/test/unittests/test_skills.py
index 675a2f58..e3098956 100644
--- a/test/unittests/test_skills.py
+++ b/test/unittests/test_skills.py
@@ -2,6 +2,7 @@
 from unittest.mock import patch
 
 from ovos_plugin_manager.utils import PluginTypes, PluginConfigTypes
+from ovos_plugin_manager.skillz import get_skill_directories, get_default_skills_directory
 
 
 class TestSkills(unittest.TestCase):
@@ -16,6 +17,34 @@ def test_find_plugins(self, find_plugins):
         find_skill_plugins()
         find_plugins.assert_called_once_with(self.PLUGIN_TYPE)
 
+    
+    def test_get_skill_directories(self):
+        # Default directory
+        mock_config = {'skills': {}}
+        default_directories = get_skill_directories(mock_config)
+        for directory in default_directories:
+            self.assertEqual(basename(directory), 'skills')
+        # Configured directory
+        mock_config['skills']['directory'] = 'test'
+        test_directories = get_skill_directories(mock_config)
+        for directory in test_directories:
+            self.assertEqual(basename(directory), 'test')
+        self.assertEqual(len(default_directories), len(test_directories))
+
+    def test_get_default_skills_directory(self):
+        # Default directory
+        mock_config = {'skills': {}}
+        default_dir = get_default_skills_directory(mock_config)
+        self.assertTrue(isdir(default_dir))
+        self.assertEqual(basename(default_dir), 'skills')
+        self.assertEqual(dirname(dirname(default_dir)), self.test_data_path)
+        # Override directory
+        mock_config['skills']['directory'] = 'test'
+        test_dir = get_default_skills_directory(mock_config)
+        self.assertTrue(isdir(test_dir))
+        self.assertEqual(basename(test_dir), 'test')
+        self.assertEqual(dirname(dirname(test_dir)), self.test_data_path)
+        
     def test_load_skill_plugins(self):
         from ovos_plugin_manager.skills import load_skill_plugins
         # TODO

From 3c0e105cf31e40939a9cf0f7442825ffe80e1cfb Mon Sep 17 00:00:00 2001
From: JarbasAI <33701864+JarbasAl@users.noreply.github.com>
Date: Fri, 29 Dec 2023 13:59:44 +0000
Subject: [PATCH 2/2] Update test_skills.py

---
 test/unittests/test_skills.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unittests/test_skills.py b/test/unittests/test_skills.py
index e3098956..b8bfb117 100644
--- a/test/unittests/test_skills.py
+++ b/test/unittests/test_skills.py
@@ -2,7 +2,7 @@
 from unittest.mock import patch
 
 from ovos_plugin_manager.utils import PluginTypes, PluginConfigTypes
-from ovos_plugin_manager.skillz import get_skill_directories, get_default_skills_directory
+from ovos_plugin_manager.skills import get_skill_directories, get_default_skills_directory
 
 
 class TestSkills(unittest.TestCase):