Split test_macros

tests/unit/test_macros/test_macros.py

@@ -28,7 +28,7 @@
 )
 
 from inputremapper.configs.keyboard_layout import keyboard_layout
-from inputremapper.injection.macros.macro import Macro, macro_variables
+from inputremapper.injection.macros.macro import Macro
 from inputremapper.injection.macros.parse import Parser
 from tests.lib.test_setup import test_setup
 from tests.unit.test_macros.macro_test_base import MacroTestBase, DummyMapping
@@ -162,19 +162,6 @@ async def test_duplicate_run(self):
         ] * 2
         self.assertListEqual(self.result, expected)
 
-    async def test_set(self):
-        """await Parser.parse('set(a, "foo")', self.context, DummyMapping).run(self.handler)
-        self.assertEqual(macro_variables.get("a"), "foo")
-
-        await Parser.parse('set( \t"b" \n, "1")', self.context, DummyMapping).run(self.handler)
-        self.assertEqual(macro_variables.get("b"), "1")"""
-
-        await Parser.parse("set(a, 1)", self.context, DummyMapping).run(self.handler)
-        self.assertEqual(macro_variables.get("a"), 1)
-
-        """await Parser.parse("set(a, )", self.context, DummyMapping).run(self.handler)
-        self.assertEqual(macro_variables.get("a"), None)"""
-
 
 if __name__ == "__main__":
     unittest.main()

tests/unit/test_macros/test_set.py

@@ -25,6 +25,7 @@
 
 from inputremapper.configs.keyboard_layout import keyboard_layout
 from inputremapper.configs.validation_errors import MacroError
+from inputremapper.injection.macros.macro import macro_variables
 from inputremapper.injection.macros.parse import Parser
 from tests.lib.test_setup import test_setup
 from tests.unit.test_macros.macro_test_base import MacroTestBase, DummyMapping
@@ -46,6 +47,19 @@ async def test_set_key(self):
             ],
         )
 
+    async def test_set(self):
+        """await Parser.parse('set(a, "foo")', self.context, DummyMapping).run(self.handler)
+        self.assertEqual(macro_variables.get("a"), "foo")
+
+        await Parser.parse('set( \t"b" \n, "1")', self.context, DummyMapping).run(self.handler)
+        self.assertEqual(macro_variables.get("b"), "1")"""
+
+        await Parser.parse("set(a, 1)", self.context, DummyMapping).run(self.handler)
+        self.assertEqual(macro_variables.get("a"), 1)
+
+        """await Parser.parse("set(a, )", self.context, DummyMapping).run(self.handler)
+        self.assertEqual(macro_variables.get("a"), None)"""
+
     async def test_raises_error(self):
         self.assertRaises(MacroError, Parser.parse, "set($a, 1)", self.context)
         self.assertRaises(MacroError, Parser.parse, "set(1, 2)", self.context)