Changeset b2a5042 in sasview

Timestamp:

Aug 22, 2017 8:10:57 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

e43fc91

Parents:

464cd07

Message:

Allow QClipboard tests on windows only

Location:

src/sas/qtgui/Plotting/UnitTesting

Files:

• Plotter2DTest.py (modified) (4 diffs)
• PlotterBaseTest.py (modified) (3 diffs)
• PlotterTest.py (modified) (4 diffs)

src/sas/qtgui/Plotting/UnitTesting/Plotter2DTest.py

@@ -2 +2 @@
 import unittest
 import numpy
+import platform
 
 from PyQt4 import QtGui
@@ -48 +49 @@
         self.data.title="Test data"
         self.data.id = 1
+        self.isWindows = platform.system=="Windows"
 
     def tearDown(self):
@@ -156 +158 @@
         self.assertEqual(actions[2].text(), "Copy to Clipboard")
 
+        # Trigger Toggle Grid and make sure the method is called
+        self.assertEqual(actions[4].text(), "Toggle Grid On/Off")
+        self.plotter.ax.grid = MagicMock()
+        actions[4].trigger()
+        self.assertTrue(self.plotter.ax.grid.called)
+
+        # Trigger Change Scale and make sure the method is called
+        self.assertEqual(actions[6].text(), "Toggle Linear/Log Scale")
+        FigureCanvas.draw_idle = MagicMock()
+        actions[6].trigger()
+        self.assertTrue(FigureCanvas.draw_idle.called)
+
         # Spy on cliboard's dataChanged() signal
+        if not self.isWindows:
+            return
         self.clipboard_called = False
         def done():
@@ -164 +180 @@
         QtGui.qApp.processEvents()
         # Make sure clipboard got updated.
-        #self.assertTrue(self.clipboard_called)
-
-        # Trigger Toggle Grid and make sure the method is called
-        self.assertEqual(actions[4].text(), "Toggle Grid On/Off")
-        self.plotter.ax.grid = MagicMock()
-        actions[4].trigger()
-        self.assertTrue(self.plotter.ax.grid.called)
-
-        # Trigger Change Scale and make sure the method is called
-        self.assertEqual(actions[6].text(), "Toggle Linear/Log Scale")
-        FigureCanvas.draw_idle = MagicMock()
-        actions[6].trigger()
-        self.assertTrue(FigureCanvas.draw_idle.called)
+        self.assertTrue(self.clipboard_called)
 
     def testShowNoPlot(self):

src/sas/qtgui/Plotting/UnitTesting/PlotterBaseTest.py

@@ -1 +1 @@
 import sys
 import unittest
+import platform
 from mock import patch, MagicMock
 
@@ -35 +36 @@
         #PlotterBase.PlotterBase.contextMenuQuickPlot = MagicMock()
         self.plotter = PlotterBase.PlotterBase(None, manager=dummy_manager(), quickplot=True)
+        self.isWindows = platform.system=="Windows"
 
     def tearDown(self):
@@ -147 +149 @@
 
         # Spy on cliboard's dataChanged() signal
+        if not self.isWindows:
+            return
         self.clipboard_called = False
         def done():

src/sas/qtgui/Plotting/UnitTesting/PlotterTest.py

@@ -1 +1 @@
 import sys
 import unittest
+import platform
 
 from PyQt4 import QtGui
@@ -37 +38 @@
         self.data.name="Test name"
         self.data.id = 1
+        self.isWindows = platform.system=="Windows"
 
     def tearDown(self):
@@ -94 +96 @@
         self.assertEqual(actions[2].text(), "Copy to Clipboard")
 
+        # Trigger Toggle Grid and make sure the method is called
+        self.assertEqual(actions[4].text(), "Toggle Grid On/Off")
+        self.plotter.ax.grid = MagicMock()
+        actions[4].trigger()
+        self.assertTrue(self.plotter.ax.grid.called)
+
+        # Trigger Change Scale and make sure the method is called
+        self.assertEqual(actions[6].text(), "Change Scale")
+        self.plotter.properties.exec_ = MagicMock(return_value=QtGui.QDialog.Rejected)
+        actions[6].trigger()
+        self.assertTrue(self.plotter.properties.exec_.called)
+
         # Spy on cliboard's dataChanged() signal
+        if not self.isWindows:
+            return
         self.clipboard_called = False
         def done():
@@ -102 +118 @@
         QtGui.qApp.processEvents()
         # Make sure clipboard got updated.
-        #self.assertTrue(self.clipboard_called)
-
-        # Trigger Toggle Grid and make sure the method is called
-        self.assertEqual(actions[4].text(), "Toggle Grid On/Off")
-        self.plotter.ax.grid = MagicMock()
-        actions[4].trigger()
-        self.assertTrue(self.plotter.ax.grid.called)
-
-        # Trigger Change Scale and make sure the method is called
-        self.assertEqual(actions[6].text(), "Change Scale")
-        self.plotter.properties.exec_ = MagicMock(return_value=QtGui.QDialog.Rejected)
-        actions[6].trigger()
-        self.assertTrue(self.plotter.properties.exec_.called)
+        self.assertTrue(self.clipboard_called)
 
     def testXyTransform(self):