Fix generator tests

Author: OCopping

tests/test_generate.py

@@ -108,12 +108,12 @@ def test_generator_get_group_dimensions(generator):
 
 def test_generator_create_widget_keyerror(generator, caplog):
     generator._get_screen_dimensions = Mock(return_value=(800, 1280))
-    generator.screen_name = "test"
+    screen_name = "test"
     component = Entity(
         type="key.notavailable", P="BL23B-DI-MOD-02", desc=None, M=None, R="CAM:"
     )
 
-    result = generator._create_widget(component=component)
+    result = generator._create_widget(name=screen_name, component=component)
 
     assert result is None
     assert (
@@ -130,11 +130,11 @@ def test_generator_create_widget_is_list_of_dicts(generator):
             name="X", file="", x=0, y=0, width=205, height=120
         )
     )
-    generator.screen_name = "test"
+    screen_name = "test"
     component = Entity(
         type="ADAravis.aravisCamera", P="BL23B-DI-MOD-02", desc=None, M=None, R="CAM:"
     )
-    widget = generator._create_widget(component=component)
+    widget = generator._create_widget(name=screen_name, component=component)
     for value in widget:
         assert str(value) == str(
             pwidget.EmbeddedDisplay(name="X", file="", x=0, y=0, width=205, height=120)
@@ -143,11 +143,13 @@ def test_generator_create_widget_is_list_of_dicts(generator):
 
 def test_generator_create_widget_embedded(generator):
     generator._get_screen_dimensions = Mock(return_value=(800, 1280))
+    screen_name = "test"
     component = Entity(
         type="ADAravis.aravisCamera", P="BL23B-DI-MOD-02", desc=None, M=None, R="CAM:"
     )
 
     widget = generator._create_widget(
+        name=screen_name,
         component=component,
     )
     control_widget = Path("tests/test_files/widget.xml")
@@ -219,11 +221,13 @@ def test_generator_allocate_widget(generator):
 
 def test_generator_create_widget_related(generator):
     generator._get_screen_dimensions = Mock(return_value=(800, 1280))
+    screen_name = "test"
     component = Entity(
         type="pmac.GeoBrick", P="BL23B-MO-BRICK-01", desc=None, M=":M", R=None
     )
 
     widget = generator._create_widget(
+        name=screen_name,
         component=component,
     )
 
@@ -235,11 +239,13 @@ def test_generator_create_widget_related(generator):
 
 def test_generator_create_widget_related_no_suffix(generator):
     generator._get_screen_dimensions = Mock(return_value=(800, 1280))
+    screen_name = "test"
     component = Entity(
         type="pmac.GeoBrick", P="BL23B-MO-BRICK-01", desc=None, M=None, R=None
     )
 
     widget = generator._create_widget(
+        name=screen_name,
         component=component,
     )
 
@@ -300,27 +306,27 @@ def test_generator_build_screen(generator):
         ]
     )
     generator._get_group_dimensions = Mock(return_value=(600, 400))
-    generator.screen_name = "test"
-    generator.screen_components = [Mock(), Mock(), Mock()]
+    screen_name = "test"
+    screen_components = [Mock(), Mock(), Mock()]
 
-    generator.build_widgets()
-    generator.build_groups()
-    generator.build_screen()
+    generator.build_widgets(screen_name, screen_components)
+    generator.build_groups(screen_name)
+    generator.build_screen(screen_name)
     assert objectify.fromstring(str(generator.screen_)).xpath("//widget[@type='group']")
 
 
 def test_generator_write_screen(generator):
-    generator.screen_name = "test"
+    screen_name = "test"
     generator.screen_ = pscreen.Screen("test")
     generator.widgets = [Mock(), Mock()]
-    generator.write_screen(Path("tests/test_files/"))
+    generator.write_screen(screen_name, Path("tests/test_files/"))
     assert Path("tests/test_files/test.bob").exists()
     Path("tests/test_files/test.bob").unlink()
 
 
 def test_generator_write_screen_no_widgets(generator, caplog):
-    generator.screen_name = "test"
+    screen_name = "test"
     generator.screen_ = pscreen.Screen("test")
     generator.widgets = []
-    generator.write_screen(Path("tests/test_files/"))
+    generator.write_screen(screen_name, Path("tests/test_files/"))
     assert "Could not write screen: test as no widgets were available" in caplog.text