tests passing

Author: adedamola-sode

tests/test_files/widget.xml

@@ -3,11 +3,11 @@
   <name>CAM:</name>
   <x>0</x>
   <y>0</y>
-  <width>990</width>
-  <height>570</height>
+  <width>860</width>
+  <height>450</height>
   <file>techui-support/bob/ADAravis/ADAravis_summary.bob</file>
   <macros>
     <P>BL23B-DI-MOD-02</P>
-    <R>CAM:</R>
+    <R>CAM</R>
   </macros>
 </widget>

tests/test_files/widget_related.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" ?>
 <widget type="action_button" version="2.0.0">
-  <name>:M</name>
+  <name>M</name>
   <x>0</x>
   <y>0</y>
   <width>100</width>
   <height>40</height>
-  <pv_name>BL23B-MO-BRICK-01:M</pv_name>
-  <text>:M</text>
+  <pv_name/>
+  <text>M</text>
   <actions>
     <action type="open_display">
       <description>Open Display</description>

tests/test_files/widget_related_no_suffix.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" ?>
 <widget type="action_button" version="2.0.0">
-  <name>pmac.GeoBrick</name>
+  <name>BL23B-MO-BRICK-01</name>
   <x>0</x>
   <y>0</y>
   <width>100</width>
   <height>40</height>
-  <pv_name>BL23B-MO-BRICK-01</pv_name>
-  <text>pmac.GeoBrick</text>
+  <pv_name/>
+  <text>BL23B-MO-BRICK-01</text>
   <actions>
     <action type="open_display">
       <description>Open Display</description>

tests/test_generate.py

@@ -142,7 +142,7 @@ def test_generator_create_widget_is_list_of_dicts(generator):
 
 
 def test_generator_create_widget_embedded(generator):
-    generator._get_screen_dimensions = Mock(return_value=(570, 990))
+    generator._get_screen_dimensions = Mock(return_value=(450, 860))
     screen_name = "test"
     component = Entity(
         type="ADAravis.aravisCamera", P="BL23B-DI-MOD-02", desc=None, M=None, R="CAM:"
@@ -186,7 +186,7 @@ def test_generator_initialise_name_suffix_none(generator):
 
     name, suffix, suffix_label = generator._initialise_name_suffix(component)
 
-    assert name == "test"
+    assert name == component.P
     assert suffix == ""
     assert suffix_label == ""