Skip to content

Commit

Permalink
re #6669 damn mixture of tabs and spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
NickDraper committed May 16, 2013
1 parent fc3ccd0 commit 18e3aa2
Showing 1 changed file with 22 additions and 22 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

class LoadLogPropertyTableTest(unittest.TestCase):

def test_LoadValidFilesComments(self):
autoTestDir="../../../../../Test/AutoTestData/"
outputWorskapceName = "LoadLogPropertyTableTest_Test1"
def test_LoadValidFilesComments(self):
autoTestDir = "../../../../../Test/AutoTestData/"
outputWorskapceName = "LoadLogPropertyTableTest_Test1"
alg_test = run_algorithm("LoadLogPropertyTable", FirstFile = autoTestDir + "MUSR00015189.nxs",
LastFile = autoTestDir + "MUSR00015194.nxs", LogNames="comment", OutputWorkspace = outputWorskapceName)

Expand All @@ -21,20 +21,20 @@ def test_LoadValidFilesComments(self):
#Verify some values
tablews = AnalysisDataService.retrieve(outputWorskapceName)
self.assertEqual(6, tablews.rowCount())
self.assertEqual(2, tablews.columnCount())
self.assertEqual("18.95MHz 100W", print output.cell(0,1))
self.assertEqual("15189", print output.cell(0,0))
self.assertEqual("15194", print output.cell(5,0))
self.assertEqual(2, tablews.columnCount())
self.assertEqual("18.95MHz 100W", print output.cell(0,1))
self.assertEqual("15189", print output.cell(0,0))
self.assertEqual("15194", print output.cell(5,0))

run_algorithm("DeleteWorkspace", Workspace = outputWorskapceName)
run_algorithm("DeleteWorkspace", Workspace = outputWorskapceName)

return
def test_LoadPartiallyValidFilesLogValues(self):
def test_LoadPartiallyValidFilesLogValues(self):
autoTestDir="../../../../../Test/AutoTestData/"
outputWorskapceName = "LoadLogPropertyTableTest_Test2"
outputWorskapceName = "LoadLogPropertyTableTest_Test2"
alg_test = run_algorithm("LoadLogPropertyTable", FirstFile = autoTestDir + "argus0026287.nxs",
LastFile = autoTestDir + "argus0026577.nxs", LogNames="temperature_1_log", OutputWorkspace = outputWorskapceName)

Expand All @@ -43,14 +43,14 @@ def test_LoadPartiallyValidFilesLogValues(self):
#Verify some values
tablews = AnalysisDataService.retrieve(outputWorskapceName)
self.assertEqual(2, tablews.rowCount())
self.assertEqual(2, tablews.columnCount())
self.assertEqual("26287", print output.cell(0,0))
self.assertEqual("180", print output.cell(0,1))
self.assertEqual("26287", print output.cell(1,0))
self.assertEqual("7.32055", print output.cell(1,1))

run_algorithm("DeleteWorkspace", Workspace = outputWorskapceName)
self.assertEqual(2, tablews.columnCount())
self.assertEqual("26287", print output.cell(0,0))
self.assertEqual("180", print output.cell(0,1))
self.assertEqual("26287", print output.cell(1,0))
self.assertEqual("7.32055", print output.cell(1,1))

run_algorithm("DeleteWorkspace", Workspace = outputWorskapceName)

return

Expand Down

0 comments on commit 18e3aa2

Please sign in to comment.