From 58d44a23eabb0b9fea1cf6f02a41e8d8ef0615f3 Mon Sep 17 00:00:00 2001
From: Richard Cunningham <fye77278@pc0142.cs.diamond.ac.uk>
Date: Tue, 24 Sep 2024 15:40:41 +0100
Subject: [PATCH] Updated PandABlocks to interface with PVI 0.10.0

---
 pyproject.toml                 |  2 +-
 src/pandablocks_ioc/_pvi.py    | 47 +++++++++++++++--------------
 src/pandablocks_ioc/_tables.py |  8 +++--
 tests/test-bobfiles/DATA.bob   | 55 ++++++++++++++++++++--------------
 tests/test-bobfiles/PCAP.bob   | 29 ++++++++++--------
 tests/test-bobfiles/PULSE.bob  | 12 ++++----
 tests/test-bobfiles/PandA.bob  |  6 ++--
 tests/test-bobfiles/SEQ.bob    | 18 +++++++----
 tests/test-bobfiles/index.bob  | 18 ++++++-----
 tests/test_ioc_system.py       |  2 +-
 10 files changed, 117 insertions(+), 80 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 33c01564..9156f04a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,7 +18,7 @@ dependencies = [
     "h5py",
     "softioc>=4.4.0",
     "pandablocks~=0.10.0",
-    "pvi~=0.7.0",
+    "pvi",
     "typing-extensions;python_version<'3.8'",
 ] # Add project dependencies here, e.g. ["click", "numpy"]
 dynamic = ["version"]
diff --git a/src/pandablocks_ioc/_pvi.py b/src/pandablocks_ioc/_pvi.py
index 2849b244..5e6ff30e 100644
--- a/src/pandablocks_ioc/_pvi.py
+++ b/src/pandablocks_ioc/_pvi.py
@@ -82,8 +82,9 @@ def add_data_capture_pvi_info(
 ):
     component = SignalRW(
         name=epics_to_pvi_name(data_capture_record_name),
-        pv=data_capture_record_name,
-        widget=ButtonPanel(actions={"Start": "1", "Stop": "0"}),
+        read_pv=data_capture_record_name,
+        write_pv=data_capture_record_name,
+        write_widget=ButtonPanel(actions={"Start": "1", "Stop": "0"}),
         read_widget=LED(),
     )
     add_pvi_info_to_record(data_capture_pvi_record, data_capture_record_name, "rw")
@@ -96,8 +97,9 @@ def add_pcap_arm_pvi_info(group: PviGroup, pcap_arm_pvi_record: RecordWrapper):
     pcap_arm_record_name = EpicsName("PCAP:ARM")
     component = SignalRW(
         name=epics_to_pvi_name(pcap_arm_record_name),
-        pv=pcap_arm_record_name,
-        widget=ButtonPanel(actions={"Arm": "1", "Disarm": "0"}),
+        read_pv=pcap_arm_record_name,
+        write_pv=pcap_arm_record_name,
+        write_widget=ButtonPanel(actions={"Arm": "1", "Disarm": "0"}),
         read_widget=LED(),
     )
     add_pvi_info_to_record(pcap_arm_pvi_record, pcap_arm_record_name, "rw")
@@ -122,14 +124,15 @@ def add_automatic_pvi_info(
         if record_name == "PCAP:ARM":
             component = SignalRW(
                 name=pvi_name,
-                pv=record_name,
+                read_pv=record_name,
+                # write_pv=record_name,
                 widget=ButtonPanel(actions={"Arm": "1", "Disarm": "0"}),
                 read_widget=LED(),
             )
             access = "rw"
 
         else:
-            component = SignalX(name=pvi_name, pv=record_name, value="")
+            component = SignalX(name=pvi_name, write_pv=record_name, value="")
             access = "x"
     elif writeable:
         if useComboBox:
@@ -142,8 +145,7 @@ def add_automatic_pvi_info(
                 widget = TextWrite(format=TextFormat.string)
             else:
                 widget = TextWrite(format=None)
-
-        component = SignalRW(name=pvi_name, pv=record_name, widget=widget)
+        component = SignalRW(name=pvi_name, write_pv=record_name, write_widget=widget)
         access = "rw"
     else:
         if record_creation_func in (
@@ -154,7 +156,8 @@ def add_automatic_pvi_info(
         else:
             widget = TextRead(format=None)
 
-        component = SignalR(name=pvi_name, pv=record_name, widget=widget)
+        component = SignalR(name=pvi_name, read_pv=record_name)
+        # , read_widget=widget
         access = "r"
 
     add_pvi_info_to_record(record, record_name, access)
@@ -185,38 +188,38 @@ def add_positions_table_row(
         SignalR(
             name=epics_to_pvi_name(value_record_name),
             label=value_record_name,
-            pv=value_record_name,
-            widget=TextRead(),
+            read_pv=value_record_name,
+            read_widget=TextRead(),
         ),
         SignalRW(
             name=epics_to_pvi_name(units_record_name),
             label=units_record_name,
-            pv=units_record_name,
-            widget=TextWrite(),
+            write_pv=units_record_name,
+            write_widget=TextWrite(),
         ),
         SignalRW(
             name=epics_to_pvi_name(scale_record_name),
             label=scale_record_name,
-            pv=scale_record_name,
-            widget=TextWrite(),
+            write_pv=scale_record_name,
+            write_widget=TextWrite(),
         ),
         SignalRW(
             name=epics_to_pvi_name(offset_record_name),
             label=offset_record_name,
-            pv=offset_record_name,
-            widget=TextWrite(),
+            write_pv=offset_record_name,
+            write_widget=TextWrite(),
         ),
         SignalRW(
             name=epics_to_pvi_name(dataset_record_name),
             label=dataset_record_name,
-            pv=dataset_record_name,
-            widget=TextWrite(),
+            write_pv=dataset_record_name,
+            write_widget=TextWrite(),
         ),
         SignalRW(
             name=epics_to_pvi_name(capture_record_name),
             label=capture_record_name,
-            pv=capture_record_name,
-            widget=ComboBox(),
+            write_pv=capture_record_name,
+            write_widget=ComboBox(),
         ),
     ]
 
@@ -375,4 +378,4 @@ def create_pvi_records(record_prefix: str):
 
                 Pvi.add_general_device_refs_to_groups(device)
 
-                formatter.format(device, record_prefix + ":", bobfile_path)
+                formatter.format(device, bobfile_path)
diff --git a/src/pandablocks_ioc/_tables.py b/src/pandablocks_ioc/_tables.py
index 25df25c2..14309737 100644
--- a/src/pandablocks_ioc/_tables.py
+++ b/src/pandablocks_ioc/_tables.py
@@ -236,7 +236,11 @@ def __init__(
         Pvi.add_pvi_info(
             table_name,
             pvi_group,
-            SignalRW(name=pvi_table_name, pv=table_name, widget=TableWrite(widgets=[])),
+            SignalRW(
+                name=pvi_table_name,
+                write_pv=table_name,
+                write_widget=TableWrite(widgets=[]),
+            ),
         )
 
         # Note that the table_updater's table_fields are guaranteed sorted in bit order,
@@ -308,7 +312,7 @@ def __init__(
         Pvi.add_pvi_info(
             mode_record_name,
             pvi_group,
-            SignalRW(name=pvi_name, pv=mode_record_name, widget=ComboBox()),
+            SignalRW(name=pvi_name, write_pv=mode_record_name, write_widget=ComboBox()),
         )
 
         self.mode_record_info = RecordInfo(lambda x: x, labels, False)
diff --git a/tests/test-bobfiles/DATA.bob b/tests/test-bobfiles/DATA.bob
index 51939078..14a479f6 100644
--- a/tests/test-bobfiles/DATA.bob
+++ b/tests/test-bobfiles/DATA.bob
@@ -1,7 +1,7 @@
 <display version="2.0.0">
-  <name>Display</name>
+  <name>DATA</name>
   <x>0</x>
-  <y>0</y>
+  <y use_class="true">0</y>
   <width>506</width>
   <height>463</height>
   <grid_step_x>4</grid_step_x>
@@ -9,7 +9,7 @@
   <widget type="label" version="2.0.0">
     <name>Title</name>
     <class>TITLE</class>
-    <text>DATA - TEST_PREFIX:</text>
+    <text>DATA</text>
     <x use_class="true">0</x>
     <y use_class="true">0</y>
     <width>506</width>
@@ -39,10 +39,11 @@
       <y>0</y>
       <width>250</width>
       <height>20</height>
+      <tooltip>$(text)</tooltip>
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>TextEntry</name>
-      <pv_name>TEST_PREFIX:DATA:HDF_DIRECTORY</pv_name>
+      <pv_name>DATA:HDF_DIRECTORY</pv_name>
       <x>255</x>
       <y>0</y>
       <width>205</width>
@@ -57,10 +58,11 @@
       <y>25</y>
       <width>250</width>
       <height>20</height>
+      <tooltip>$(text)</tooltip>
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>TextEntry</name>
-      <pv_name>TEST_PREFIX:DATA:CREATE_DIRECTORY</pv_name>
+      <pv_name>DATA:CREATE_DIRECTORY</pv_name>
       <x>255</x>
       <y>25</y>
       <width>205</width>
@@ -74,10 +76,11 @@
       <y>50</y>
       <width>250</width>
       <height>20</height>
+      <tooltip>$(text)</tooltip>
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>TextUpdate</name>
-      <pv_name>TEST_PREFIX:DATA:DIRECTORY_EXISTS</pv_name>
+      <pv_name>DATA:DIRECTORY_EXISTS</pv_name>
       <x>255</x>
       <y>50</y>
       <width>205</width>
@@ -95,10 +98,11 @@
       <y>75</y>
       <width>250</width>
       <height>20</height>
+      <tooltip>$(text)</tooltip>
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>TextEntry</name>
-      <pv_name>TEST_PREFIX:DATA:HDF_FILE_NAME</pv_name>
+      <pv_name>DATA:HDF_FILE_NAME</pv_name>
       <x>255</x>
       <y>75</y>
       <width>205</width>
@@ -113,10 +117,11 @@
       <y>100</y>
       <width>250</width>
       <height>20</height>
+      <tooltip>$(text)</tooltip>
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>TextUpdate</name>
-      <pv_name>TEST_PREFIX:DATA:HDF_FULL_FILE_PATH</pv_name>
+      <pv_name>DATA:HDF_FULL_FILE_PATH</pv_name>
       <x>255</x>
       <y>100</y>
       <width>205</width>
@@ -126,7 +131,6 @@
       </font>
       </font>
       <horizontal_alignment>1</horizontal_alignment>
-      <format>6</format>
     </widget>
   </widget>
   <widget type="group" version="2.0.0">
@@ -143,10 +147,11 @@
       <y>0</y>
       <width>250</width>
       <height>20</height>
+      <tooltip>$(text)</tooltip>
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>TextEntry</name>
-      <pv_name>TEST_PREFIX:DATA:NUM_CAPTURE</pv_name>
+      <pv_name>DATA:NUM_CAPTURE</pv_name>
       <x>255</x>
       <y>0</y>
       <width>205</width>
@@ -160,10 +165,11 @@
       <y>25</y>
       <width>250</width>
       <height>20</height>
+      <tooltip>$(text)</tooltip>
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>TextUpdate</name>
-      <pv_name>TEST_PREFIX:DATA:NUM_CAPTURED</pv_name>
+      <pv_name>DATA:NUM_CAPTURED</pv_name>
       <x>255</x>
       <y>25</y>
       <width>205</width>
@@ -181,10 +187,11 @@
       <y>50</y>
       <width>250</width>
       <height>20</height>
+      <tooltip>$(text)</tooltip>
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>TextUpdate</name>
-      <pv_name>TEST_PREFIX:DATA:NUM_RECEIVED</pv_name>
+      <pv_name>DATA:NUM_RECEIVED</pv_name>
       <x>255</x>
       <y>50</y>
       <width>205</width>
@@ -202,10 +209,11 @@
       <y>75</y>
       <width>250</width>
       <height>20</height>
+      <tooltip>$(text)</tooltip>
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>TextEntry</name>
-      <pv_name>TEST_PREFIX:DATA:FLUSH_PERIOD</pv_name>
+      <pv_name>DATA:FLUSH_PERIOD</pv_name>
       <x>255</x>
       <y>75</y>
       <width>205</width>
@@ -219,10 +227,11 @@
       <y>100</y>
       <width>250</width>
       <height>20</height>
+      <tooltip>$(text)</tooltip>
     </widget>
     <widget type="action_button" version="3.0.0">
       <name>WritePV</name>
-      <pv_name>TEST_PREFIX:DATA:CAPTURE</pv_name>
+      <pv_name>DATA:CAPTURE</pv_name>
       <actions>
         <action type="write_pv">
           <pv_name>$(pv_name)</pv_name>
@@ -235,11 +244,11 @@
       <y>100</y>
       <width>65</width>
       <height>20</height>
-      <tooltip>$(actions)</tooltip>
+      <tooltip>DATA:CAPTURE = 1</tooltip>
     </widget>
     <widget type="action_button" version="3.0.0">
       <name>WritePV</name>
-      <pv_name>TEST_PREFIX:DATA:CAPTURE</pv_name>
+      <pv_name>DATA:CAPTURE</pv_name>
       <actions>
         <action type="write_pv">
           <pv_name>$(pv_name)</pv_name>
@@ -252,11 +261,11 @@
       <y>100</y>
       <width>65</width>
       <height>20</height>
-      <tooltip>$(actions)</tooltip>
+      <tooltip>DATA:CAPTURE = 0</tooltip>
     </widget>
     <widget type="led" version="2.0.0">
       <name>LED</name>
-      <pv_name>TEST_PREFIX:DATA:CAPTURE</pv_name>
+      <pv_name>DATA:CAPTURE</pv_name>
       <x>417</x>
       <y>100</y>
       <width>20</width>
@@ -269,10 +278,11 @@
       <y>125</y>
       <width>250</width>
       <height>20</height>
+      <tooltip>$(text)</tooltip>
     </widget>
     <widget type="combo" version="2.0.0">
       <name>ComboBox</name>
-      <pv_name>TEST_PREFIX:DATA:CAPTURE_MODE</pv_name>
+      <pv_name>DATA:CAPTURE_MODE</pv_name>
       <x>255</x>
       <y>125</y>
       <width>205</width>
@@ -285,6 +295,7 @@
       <y>150</y>
       <width>250</width>
       <height>20</height>
+      <tooltip>$(text)</tooltip>
     </widget>
     <widget type="action_button" version="3.0.0">
       <name>OpenDisplay</name>
@@ -295,7 +306,7 @@
           <description>Open Display</description>
         </action>
       </actions>
-      <text>All Postion Capture Parameters</text>
+      <text>SubScreen</text>
       <x>255</x>
       <y>150</y>
       <width>205</width>
@@ -317,10 +328,11 @@
       <y>0</y>
       <width>250</width>
       <height>20</height>
+      <tooltip>$(text)</tooltip>
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>TextUpdate</name>
-      <pv_name>TEST_PREFIX:DATA:STATUS</pv_name>
+      <pv_name>DATA:STATUS</pv_name>
       <x>255</x>
       <y>0</y>
       <width>205</width>
@@ -330,7 +342,6 @@
       </font>
       </font>
       <horizontal_alignment>1</horizontal_alignment>
-      <format>6</format>
     </widget>
   </widget>
 </display>
diff --git a/tests/test-bobfiles/PCAP.bob b/tests/test-bobfiles/PCAP.bob
index b12f84f6..7586bb06 100644
--- a/tests/test-bobfiles/PCAP.bob
+++ b/tests/test-bobfiles/PCAP.bob
@@ -1,7 +1,7 @@
 <display version="2.0.0">
-  <name>Display</name>
+  <name>PCAP</name>
   <x>0</x>
-  <y>0</y>
+  <y use_class="true">0</y>
   <width>506</width>
   <height>227</height>
   <grid_step_x>4</grid_step_x>
@@ -9,7 +9,7 @@
   <widget type="label" version="2.0.0">
     <name>Title</name>
     <class>TITLE</class>
-    <text>PCAP - TEST_PREFIX:</text>
+    <text>PCAP</text>
     <x use_class="true">0</x>
     <y use_class="true">0</y>
     <width>506</width>
@@ -39,10 +39,11 @@
       <y>0</y>
       <width>250</width>
       <height>20</height>
+      <tooltip>$(text)</tooltip>
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>TextEntry</name>
-      <pv_name>TEST_PREFIX:PCAP:LABEL</pv_name>
+      <pv_name>PCAP:LABEL</pv_name>
       <x>255</x>
       <y>0</y>
       <width>205</width>
@@ -57,10 +58,11 @@
       <y>25</y>
       <width>250</width>
       <height>20</height>
+      <tooltip>$(text)</tooltip>
     </widget>
     <widget type="action_button" version="3.0.0">
       <name>WritePV</name>
-      <pv_name>TEST_PREFIX:PCAP:ARM</pv_name>
+      <pv_name>PCAP:ARM</pv_name>
       <actions>
         <action type="write_pv">
           <pv_name>$(pv_name)</pv_name>
@@ -73,11 +75,11 @@
       <y>25</y>
       <width>65</width>
       <height>20</height>
-      <tooltip>$(actions)</tooltip>
+      <tooltip>PCAP:ARM = 1</tooltip>
     </widget>
     <widget type="action_button" version="3.0.0">
       <name>WritePV</name>
-      <pv_name>TEST_PREFIX:PCAP:ARM</pv_name>
+      <pv_name>PCAP:ARM</pv_name>
       <actions>
         <action type="write_pv">
           <pv_name>$(pv_name)</pv_name>
@@ -90,11 +92,11 @@
       <y>25</y>
       <width>65</width>
       <height>20</height>
-      <tooltip>$(actions)</tooltip>
+      <tooltip>PCAP:ARM = 0</tooltip>
     </widget>
     <widget type="led" version="2.0.0">
       <name>LED</name>
-      <pv_name>TEST_PREFIX:PCAP:ARM</pv_name>
+      <pv_name>PCAP:ARM</pv_name>
       <x>417</x>
       <y>25</y>
       <width>20</width>
@@ -107,10 +109,11 @@
       <y>50</y>
       <width>250</width>
       <height>20</height>
+      <tooltip>$(text)</tooltip>
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>TextEntry</name>
-      <pv_name>TEST_PREFIX:PCAP:GATE</pv_name>
+      <pv_name>PCAP:GATE</pv_name>
       <x>255</x>
       <y>50</y>
       <width>205</width>
@@ -125,10 +128,11 @@
       <y>75</y>
       <width>250</width>
       <height>20</height>
+      <tooltip>$(text)</tooltip>
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>TextEntry</name>
-      <pv_name>TEST_PREFIX:PCAP:GATE:DELAY</pv_name>
+      <pv_name>PCAP:GATE:DELAY</pv_name>
       <x>255</x>
       <y>75</y>
       <width>205</width>
@@ -150,10 +154,11 @@
       <y>0</y>
       <width>250</width>
       <height>20</height>
+      <tooltip>$(text)</tooltip>
     </widget>
     <widget type="combo" version="2.0.0">
       <name>ComboBox</name>
-      <pv_name>TEST_PREFIX:PCAP:TRIG_EDGE</pv_name>
+      <pv_name>PCAP:TRIG_EDGE</pv_name>
       <x>255</x>
       <y>0</y>
       <width>205</width>
diff --git a/tests/test-bobfiles/PULSE.bob b/tests/test-bobfiles/PULSE.bob
index ad90b719..193fe0a2 100644
--- a/tests/test-bobfiles/PULSE.bob
+++ b/tests/test-bobfiles/PULSE.bob
@@ -1,7 +1,7 @@
 <display version="2.0.0">
-  <name>Display</name>
+  <name>PULSE</name>
   <x>0</x>
-  <y>0</y>
+  <y use_class="true">0</y>
   <width>506</width>
   <height>116</height>
   <grid_step_x>4</grid_step_x>
@@ -9,7 +9,7 @@
   <widget type="label" version="2.0.0">
     <name>Title</name>
     <class>TITLE</class>
-    <text>PULSE - TEST_PREFIX:</text>
+    <text>PULSE</text>
     <x use_class="true">0</x>
     <y use_class="true">0</y>
     <width>506</width>
@@ -39,10 +39,11 @@
       <y>0</y>
       <width>250</width>
       <height>20</height>
+      <tooltip>$(text)</tooltip>
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>TextEntry</name>
-      <pv_name>TEST_PREFIX:PULSE:DELAY</pv_name>
+      <pv_name>PULSE:DELAY</pv_name>
       <x>255</x>
       <y>0</y>
       <width>205</width>
@@ -56,10 +57,11 @@
       <y>25</y>
       <width>250</width>
       <height>20</height>
+      <tooltip>$(text)</tooltip>
     </widget>
     <widget type="combo" version="2.0.0">
       <name>ComboBox</name>
-      <pv_name>TEST_PREFIX:PULSE:DELAY:UNITS</pv_name>
+      <pv_name>PULSE:DELAY:UNITS</pv_name>
       <x>255</x>
       <y>25</y>
       <width>205</width>
diff --git a/tests/test-bobfiles/PandA.bob b/tests/test-bobfiles/PandA.bob
index 7e9133dd..a09c6be9 100644
--- a/tests/test-bobfiles/PandA.bob
+++ b/tests/test-bobfiles/PandA.bob
@@ -1,7 +1,7 @@
 <display version="2.0.0">
-  <name>Display</name>
+  <name>PandA</name>
   <x>0</x>
-  <y>0</y>
+  <y use_class="true">0</y>
   <width>46</width>
   <height>71</height>
   <grid_step_x>4</grid_step_x>
@@ -9,7 +9,7 @@
   <widget type="label" version="2.0.0">
     <name>Title</name>
     <class>TITLE</class>
-    <text>PandA - TEST_PREFIX:</text>
+    <text>PandA</text>
     <x use_class="true">0</x>
     <y use_class="true">0</y>
     <width>46</width>
diff --git a/tests/test-bobfiles/SEQ.bob b/tests/test-bobfiles/SEQ.bob
index 0093e4af..40722aa3 100644
--- a/tests/test-bobfiles/SEQ.bob
+++ b/tests/test-bobfiles/SEQ.bob
@@ -1,7 +1,7 @@
 <display version="2.0.0">
-  <name>Display</name>
+  <name>SEQ</name>
   <x>0</x>
-  <y>0</y>
+  <y use_class="true">0</y>
   <width>506</width>
   <height>296</height>
   <grid_step_x>4</grid_step_x>
@@ -9,7 +9,7 @@
   <widget type="label" version="2.0.0">
     <name>Title</name>
     <class>TITLE</class>
-    <text>SEQ - TEST_PREFIX:</text>
+    <text>SEQ</text>
     <x use_class="true">0</x>
     <y use_class="true">0</y>
     <width>506</width>
@@ -34,11 +34,18 @@
     <transparent>true</transparent>
     <widget type="table" version="2.0.0">
       <name>Table</name>
-      <pv_name>pva://TEST_PREFIX:SEQ:TABLE</pv_name>
+      <pv_name>pva://SEQ:TABLE</pv_name>
       <x>0</x>
       <y>0</y>
       <width>0</width>
       <height>200</height>
+      <columns>
+        <column>
+          <name>Column 1</name>
+          <width>100</width>
+          <editable>true</editable>
+        </column>
+      </columns>
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
@@ -47,10 +54,11 @@
       <y>205</y>
       <width>250</width>
       <height>20</height>
+      <tooltip>$(text)</tooltip>
     </widget>
     <widget type="combo" version="2.0.0">
       <name>ComboBox</name>
-      <pv_name>TEST_PREFIX:SEQ:TABLE:MODE</pv_name>
+      <pv_name>SEQ:TABLE:MODE</pv_name>
       <x>255</x>
       <y>205</y>
       <width>205</width>
diff --git a/tests/test-bobfiles/index.bob b/tests/test-bobfiles/index.bob
index 7cd3fe08..8172b259 100644
--- a/tests/test-bobfiles/index.bob
+++ b/tests/test-bobfiles/index.bob
@@ -1,7 +1,7 @@
 <display version="2.0.0">
-  <name>Display</name>
+  <name>index</name>
   <x>0</x>
-  <y>0</y>
+  <y use_class="true">0</y>
   <width>488</width>
   <height>130</height>
   <grid_step_x>4</grid_step_x>
@@ -9,7 +9,7 @@
   <widget type="label" version="2.0.0">
     <name>Title</name>
     <class>TITLE</class>
-    <text>index - TEST_PREFIX:</text>
+    <text>index</text>
     <x use_class="true">0</x>
     <y use_class="true">0</y>
     <width>488</width>
@@ -32,6 +32,7 @@
     <y>30</y>
     <width>250</width>
     <height>20</height>
+    <tooltip>$(text)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>OpenDisplay</name>
@@ -42,7 +43,7 @@
         <description>Open Display</description>
       </action>
     </actions>
-    <text>PCAP</text>
+    <text>SubScreen</text>
     <x>278</x>
     <y>30</y>
     <width>205</width>
@@ -56,6 +57,7 @@
     <y>55</y>
     <width>250</width>
     <height>20</height>
+    <tooltip>$(text)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>OpenDisplay</name>
@@ -66,7 +68,7 @@
         <description>Open Display</description>
       </action>
     </actions>
-    <text>DATA</text>
+    <text>SubScreen</text>
     <x>278</x>
     <y>55</y>
     <width>205</width>
@@ -80,6 +82,7 @@
     <y>80</y>
     <width>250</width>
     <height>20</height>
+    <tooltip>$(text)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>OpenDisplay</name>
@@ -90,7 +93,7 @@
         <description>Open Display</description>
       </action>
     </actions>
-    <text>SEQ</text>
+    <text>SubScreen</text>
     <x>278</x>
     <y>80</y>
     <width>205</width>
@@ -104,6 +107,7 @@
     <y>105</y>
     <width>250</width>
     <height>20</height>
+    <tooltip>$(text)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>OpenDisplay</name>
@@ -114,7 +118,7 @@
         <description>Open Display</description>
       </action>
     </actions>
-    <text>PULSE</text>
+    <text>SubScreen</text>
     <x>278</x>
     <y>105</y>
     <width>205</width>
diff --git a/tests/test_ioc_system.py b/tests/test_ioc_system.py
index f56c5713..a2a316d4 100644
--- a/tests/test_ioc_system.py
+++ b/tests/test_ioc_system.py
@@ -389,7 +389,7 @@ async def test_create_bobfiles_deletes_existing_files_with_clear_bobfiles(
     Pvi.add_pvi_info(
         pv,
         PviGroup.PARAMETERS,
-        SignalX(name="TrigEdge", pv=pv, value="Falling"),
+        SignalX(name="TrigEdge", write_pv=pv, value="Falling"),
     )
     Pvi.create_pvi_records(new_random_test_prefix)