From 14b4ca3da3f3c447f94635d9df5a8dda47a3b3db Mon Sep 17 00:00:00 2001
From: Harry Jeffery <harry@exec64.co.uk>
Date: Thu, 4 Jun 2015 09:20:13 +0100
Subject: [PATCH] Revert "Revert "Fix squish tests""
---
.../refl_gui_tests/tst_basic_operation/test.py | 10 +++++-----
.../scripts/Interface/ui/reflectometer/refl_gui.py | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Code/Mantid/MantidPlot/test/squish_test_suites/refl_gui_tests/tst_basic_operation/test.py b/Code/Mantid/MantidPlot/test/squish_test_suites/refl_gui_tests/tst_basic_operation/test.py
index 3971005a3b1..a9e117b38d7 100644
--- a/Code/Mantid/MantidPlot/test/squish_test_suites/refl_gui_tests/tst_basic_operation/test.py
+++ b/Code/Mantid/MantidPlot/test/squish_test_suites/refl_gui_tests/tst_basic_operation/test.py
@@ -72,7 +72,7 @@ def do_test_minimal(test_harness):
column_index = 0
# Fetch the table
- tbl = waitForObject(":splitterList.tableMain_QTableWidget")
+ tbl = waitForObject("{name='tableMain' type='QTableWidget'}")
# Set the run number
tbl.item(row_index, column_index).setText(str(run_number))
@@ -102,7 +102,7 @@ def do_test_transmission(test_harness):
row_index = 0
# Fetch the table
- tbl = waitForObject(":splitterList.tableMain_QTableWidget")
+ tbl = waitForObject("{name='tableMain' type='QTableWidget'}")
# Set the run number
tbl.item(row_index, 0).setText(str(run_number))
@@ -131,7 +131,7 @@ def do_test_reuse_transmission(test_harness):
row_index = 0
# Fetch the table
- tbl = waitForObject(":splitterList.tableMain_QTableWidget")
+ tbl = waitForObject("{name='tableMain' type='QTableWidget'}")
# Set the first run number
tbl.item(row_index, 0).setText(str(run_number1))
@@ -166,7 +166,7 @@ def do_test_stitch_output(test_harness):
row_index = 0
# Fetch the table
- tbl = waitForObject(":splitterList.tableMain_QTableWidget")
+ tbl = waitForObject("{name='tableMain' type='QTableWidget'}")
# Set the stitched state
ck_stitched = waitForObject(':tableMain_QCheckBox')
@@ -207,7 +207,7 @@ def do_test_three_runs(test_harness):
row_index = 0
# Fetch the table
- tbl = waitForObject(":splitterList.tableMain_QTableWidget")
+ tbl = waitForObject("{name='tableMain' type='QTableWidget'}")
# Set the first run number
tbl.item(row_index, 0).setText(str(run_number1))
diff --git a/Code/Mantid/scripts/Interface/ui/reflectometer/refl_gui.py b/Code/Mantid/scripts/Interface/ui/reflectometer/refl_gui.py
index a109610bc71..3bb3aed9b00 100644
--- a/Code/Mantid/scripts/Interface/ui/reflectometer/refl_gui.py
+++ b/Code/Mantid/scripts/Interface/ui/reflectometer/refl_gui.py
@@ -32,7 +32,7 @@ except ImportError:
-class ReflGui(QtGui.QMainWindow, refl_window.Ui_windowRefl):
+class ReflGui(QtGui.QMainWindow, ui_refl_window.Ui_windowRefl):
current_instrument = None
current_table = None
--
GitLab