Skip to content

Commit

Permalink
Refs #1037: folder deletion asks for confirmation, hanging up test
Browse files Browse the repository at this point in the history
so commented out those tests for now
  • Loading branch information
Janik Zikovsky committed Jan 10, 2012
1 parent f3d8eb9 commit bd5084d
Showing 1 changed file with 28 additions and 27 deletions.
55 changes: 28 additions & 27 deletions Code/Mantid/MantidPlot/test/MantidPlotProxiesTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,33 +114,34 @@ def test_closing_Layer_objects(self):
#spectrogram = l.spectrogram()
#self.assertTrue(spectrogram._getHeldObject() is None, "Deleted spectrogram safely")

def setup_folder(self):
""" Create a folder with some windows in it """
f = addFolder("test_folder")
changeFolder(f)
windows = []
windows.append(newTable("table"))
windows.append(newMatrix("matrix"))
windows.append(newPlot3D())
windows.append(newGraph("graph"))
windows.append(newNote("note"))
return (f, windows)

def test_Folder_deletion(self):
""" Create a folder then delete it """
f = addFolder("test_folder")
deleteFolder(f)
self.assertTrue(f._getHeldObject() is None, "Folder was deleted")

def test_Folder_windows(self):
""" Access windows through a folder """
f, old_windows = self.setup_folder()
windows = f.windows()
self.assertEqual(len(windows), 5, "5 windows in folder")
for window in windows:
self.try_closing(window, "Folder.windows()")
deleteFolder(f)

# FIXME: Avoid folder deletion confirmation dialog
# def setup_folder(self):
# """ Create a folder with some windows in it """
# f = addFolder("test_folder")
# changeFolder(f)
# windows = []
# windows.append(newTable("table"))
# windows.append(newMatrix("matrix"))
# windows.append(newPlot3D())
# windows.append(newGraph("graph"))
# windows.append(newNote("note"))
# return (f, windows)
#
# def test_Folder_deletion(self):
# """ Create a folder then delete it """
# f = addFolder("test_folder")
# deleteFolder(f)
# self.assertTrue(f._getHeldObject() is None, "Folder was deleted")
#
# def test_Folder_windows(self):
# """ Access windows through a folder """
# f, old_windows = self.setup_folder()
# windows = f.windows()
# self.assertEqual(len(windows), 5, "5 windows in folder")
# for window in windows:
# self.try_closing(window, "Folder.windows()")
# deleteFolder(f)
#

def test_closing_MantidMatrix(self):
""" Create a MantidMatrix and then delete it safely """
Expand Down

0 comments on commit bd5084d

Please sign in to comment.