From 3f3cf943a615ae9843d704287e83ac9fa23e6afa Mon Sep 17 00:00:00 2001
From: Steven Hahn <hahnse@ornl.gov>
Date: Sun, 1 Jan 2017 19:50:57 -0500
Subject: [PATCH] Fix failing system tests.
---
.../SANSBeamSpreaderTransmission.py | 2 +-
.../tests/analysis/EnggCalibrationTest.py | 4 ++--
.../tests/analysis/ISISIndirectInelastic.py | 10 +++++-----
.../analysis/ISISPowderDiffractionHrpdTest.py | 20 +++++++++----------
.../tests/analysis/ISIS_PowderPolarisTest.py | 2 +-
.../tests/analysis/LoadLotsOfFiles.py | 2 +-
.../tests/analysis/ReduceOneSCD_Run.py | 2 +-
.../Reflectometry/isis_reflectometry/quick.py | 2 +-
8 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSBeamSpreaderTransmission.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSBeamSpreaderTransmission.py
index 4faf02d4a7a..5507e453b26 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSBeamSpreaderTransmission.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSBeamSpreaderTransmission.py
@@ -175,7 +175,7 @@ class SANSBeamSpreaderTransmission(PythonAlgorithm):
input_ws_name = self.getPropertyValue("InputWorkspace")
if not AnalysisDataService.doesExist(input_ws_name):
Logger("SANSBeamSpreaderTransmission").error("Could not find input workspace")
- workspace = AnalysisDataService.retrieve(input_ws_name).getName()
+ workspace = AnalysisDataService.retrieve(input_ws_name).name()
# Clone workspace to make boost-python happy
api.CloneWorkspace(InputWorkspace=workspace,
diff --git a/Testing/SystemTests/tests/analysis/EnggCalibrationTest.py b/Testing/SystemTests/tests/analysis/EnggCalibrationTest.py
index 64617343118..396dd1a63f0 100644
--- a/Testing/SystemTests/tests/analysis/EnggCalibrationTest.py
+++ b/Testing/SystemTests/tests/analysis/EnggCalibrationTest.py
@@ -74,7 +74,7 @@ class EnginXFocusWithVanadiumCorrection(stresstesting.MantidStressTest):
def validate(self):
out_ws = mtd[self.out_ws_name]
- self.assertEquals(out_ws.getName(), self.out_ws_name)
+ self.assertEquals(out_ws.name(), self.out_ws_name)
self.assertEqual(out_ws.getNumberHistograms(), 1)
self.assertEqual(out_ws.blocksize(), 10186)
self.assertEqual(out_ws.getNEvents(), 10186)
@@ -88,7 +88,7 @@ class EnginXFocusWithVanadiumCorrection(stresstesting.MantidStressTest):
self.assertEqual(dimY.getUnits(), '')
van_out_ws = mtd[self.van_bank_curves_name]
- self.assertEquals(van_out_ws.getName(), self.van_bank_curves_name)
+ self.assertEquals(van_out_ws.name(), self.van_bank_curves_name)
self.assertTrue(van_out_ws.getNumberHistograms(), 3)
self.assertEqual(out_ws.blocksize(), 10186)
diff --git a/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py b/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
index 2c56de5abde..8dc7b30f97f 100644
--- a/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
+++ b/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
@@ -778,8 +778,8 @@ class ISISIndirectInelasticIqtAndIqtFit(ISISIndirectInelasticBase):
self.endx, 0,
self.spec_max)
- self.result_names = [iqt_ws.getName(),
- iqtfitSeq_ws.getName()]
+ self.result_names = [iqt_ws.name(),
+ iqtfitSeq_ws.name()]
# Remove workspaces from Mantid
for sample in self.samples:
@@ -898,7 +898,7 @@ class ISISIndirectInelasticIqtAndIqtFitMulti(ISISIndirectInelasticBase):
DryRun=False)
# Test IqtFitMultiple
- iqtfitSeq_ws, params, fit_group = IqtFitMultiple(iqt_ws.getName(),
+ iqtfitSeq_ws, params, fit_group = IqtFitMultiple(iqt_ws.name(),
self.func,
self.ftype,
self.startx,
@@ -906,8 +906,8 @@ class ISISIndirectInelasticIqtAndIqtFitMulti(ISISIndirectInelasticBase):
self.spec_min,
self.spec_max)
- self.result_names = [iqt_ws.getName(),
- iqtfitSeq_ws.getName()]
+ self.result_names = [iqt_ws.name(),
+ iqtfitSeq_ws.name()]
#remove workspaces from mantid
for sample in self.samples:
diff --git a/Testing/SystemTests/tests/analysis/ISISPowderDiffractionHrpdTest.py b/Testing/SystemTests/tests/analysis/ISISPowderDiffractionHrpdTest.py
index 8d5bc654b27..bca8e6c8998 100644
--- a/Testing/SystemTests/tests/analysis/ISISPowderDiffractionHrpdTest.py
+++ b/Testing/SystemTests/tests/analysis/ISISPowderDiffractionHrpdTest.py
@@ -92,18 +92,18 @@ class LoadTests(unittest.TestCase):
for i in range(0, 3):
self.assertTrue(isinstance(data1[i], MatrixWorkspace))
- self.assertTrue("CalWorkspace1_group" in data1[0].getName())
- self.assertTrue("CalWorkspace1_offsets" in data1[1].getName())
- self.assertTrue("CalWorkspace1_mask" in data1[2].getName())
- self.assertTrue("CalWorkspace1_cal" in data1[3].getName())
+ self.assertTrue("CalWorkspace1_group" in data1[0].name())
+ self.assertTrue("CalWorkspace1_offsets" in data1[1].name())
+ self.assertTrue("CalWorkspace1_mask" in data1[2].name())
+ self.assertTrue("CalWorkspace1_cal" in data1[3].name())
for i in range(0, 3):
self.assertTrue(isinstance(data2[i], MatrixWorkspace))
- self.assertTrue("CalWorkspace2_group" in data2[0].getName())
- self.assertTrue("CalWorkspace2_offsets" in data2[1].getName())
- self.assertTrue("CalWorkspace2_mask" in data2[2].getName())
- self.assertTrue("CalWorkspace2_cal" in data2[3].getName())
+ self.assertTrue("CalWorkspace2_group" in data2[0].name())
+ self.assertTrue("CalWorkspace2_offsets" in data2[1].name())
+ self.assertTrue("CalWorkspace2_mask" in data2[2].name())
+ self.assertTrue("CalWorkspace2_cal" in data2[3].name())
def test_nxsfile_with_workspace(self):
self.wsname = "NexusWorkspace"
@@ -117,7 +117,7 @@ class LoadTests(unittest.TestCase):
self.assertTrue(isinstance(data[i], MatrixWorkspace))
for i in range(1, 3):
- self.assertTrue(("ResultTOF-" + str(i)) in data[i].getName())
+ self.assertTrue(("ResultTOF-" + str(i)) in data[i].name())
self.assertTrue('ResultTOFgrp', self.wsname[0])
@@ -141,7 +141,7 @@ class LoadTests(unittest.TestCase):
for i in range(0, len(file_name)):
data_list.append((LoadAscii(Filename=file_name[i], OutputWorkspace=("datWorkspace" + str(i + 1)))))
self.assertTrue(isinstance(data_list[i], MatrixWorkspace))
- self.assertTrue(("datWorkspace" + str(i + 1)) in data_list[i].getName())
+ self.assertTrue(("datWorkspace" + str(i + 1)) in data_list[i].name())
self.assertEquals(1, data_list[i].getNumberHistograms())
self.assertEquals(22981, data_list[0].blocksize())
diff --git a/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py b/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py
index 5348c7ff18c..7aa1b112781 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py
@@ -78,7 +78,7 @@ def _run_focus():
def _calibration_validation(cls, results):
_validation_setup(cls)
- results_name = results[0].getName()
+ results_name = results[0].name()
reference_file_name = "ISIS_Powder-PEARL78338_Van_Cal.nxs"
return results_name, reference_file_name
diff --git a/Testing/SystemTests/tests/analysis/LoadLotsOfFiles.py b/Testing/SystemTests/tests/analysis/LoadLotsOfFiles.py
index c641621b916..c1556903f87 100644
--- a/Testing/SystemTests/tests/analysis/LoadLotsOfFiles.py
+++ b/Testing/SystemTests/tests/analysis/LoadLotsOfFiles.py
@@ -240,7 +240,7 @@ class LoadLotsOfFiles(stresstesting.MantidStressTest):
return False
# generic checks
- if wksp.getName() is None or len(wksp.getName()) <= 0:
+ if wksp.name() is None or len(wksp.name()) <= 0:
print "Workspace does not have a name"
del wksp
return False
diff --git a/Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py b/Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py
index b72e11cd528..4139086c4b1 100644
--- a/Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py
+++ b/Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py
@@ -121,7 +121,7 @@ class ReduceOneSCD_Run( stresstesting.MantidStressTest):
peaks_ws = FindPeaksMD( MDEW, MaxPeaks=num_peaks_to_find,
PeakDistanceThreshold=distance_threshold )
- AnalysisDataService.remove( MDEW.getName() )
+ AnalysisDataService.remove( MDEW.name() )
# SaveIsawPeaks( InputWorkspace=peaks_ws, AppendFile=False,
# Filename='A'+run_niggli_integrate_file )
#
diff --git a/scripts/Reflectometry/isis_reflectometry/quick.py b/scripts/Reflectometry/isis_reflectometry/quick.py
index c99fc588e53..1d02a5df946 100644
--- a/scripts/Reflectometry/isis_reflectometry/quick.py
+++ b/scripts/Reflectometry/isis_reflectometry/quick.py
@@ -144,7 +144,7 @@ def quick_explicit(run, i0_monitor_index, lambda_min, lambda_max, background_min
if run == '0':
RunNumber = '0'
else:
- RunNumber = groupGet(_sample_ws.getName(), 'samp', 'run_number')
+ RunNumber = groupGet(_sample_ws.name(), 'samp', 'run_number')
if not pointdet:
# Proccess Multi-Detector; assume MD goes to the end:
--
GitLab