OWPythonScript: Fix tests

biolab · Aug 25, 2017 · 6f159c6 · 6f159c6
1 parent 84a7668
commit 6f159c6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/Orange/widgets/data/owpythonscript.py b/Orange/widgets/data/owpythonscript.py
@@ -474,9 +474,9 @@ def __init__(self):
 
         self.controlBox.layout().addWidget(w)
 
-        self.execute_button = gui.auto_commit(
-            self.controlArea, self, "auto_execute", "Run",
-            checkbox_label="Autorun on new data").button
+        auto = gui.auto_commit(self.controlArea, self, "auto_execute", "Run",
+                               checkbox_label="Autorun on new data")
+        self.execute_button, self.autobox = auto.button, auto.checkbox
 
         self.splitCanvas = QSplitter(Qt.Vertical, self.mainArea)
         self.mainArea.layout().addWidget(self.splitCanvas)
@@ -676,7 +676,7 @@ def initial_locals_state(self):
 
     def commit(self):
         if self.auto_execute:
-           self.execute_button.setEnabled(False)
+            self.execute_button.setEnabled(False)
         self.Error.clear()
         self._script = str(self.text.toPlainText())
         lcls = self.initial_locals_state()

diff --git a/Orange/widgets/data/tests/test_owpythonscript.py b/Orange/widgets/data/tests/test_owpythonscript.py
@@ -17,9 +17,9 @@ def setUp(self):
     def test_inputs(self):
         """Check widget's inputs"""
         for input, data in (("Data", self.iris),
-                             ("Learner", self.learner),
-                             ("Classifier", self.model),
-                             ("Object", "object")):
+                            ("Learner", self.learner),
+                            ("Classifier", self.model),
+                            ("Object", "object")):
             self.assertEqual(getattr(self.widget, input.lower()), {})
             self.send_signal(input, data, (1,))
             self.assertEqual(getattr(self.widget, input.lower()), {1: data})
@@ -38,17 +38,17 @@ def test_outputs(self):
             self.assertIs(self.get_output(signal), data)
             self.send_signal(signal, None, (1,))
             self.widget.text.setPlainText("print(in_{})".format(lsignal))
-            self.widget.execute_button.button.click()
+            self.widget.execute_button.click()
             self.assertIsNone(self.get_output(signal))
 
     def test_local_variable(self):
         """Check if variable remains in locals after removed from script"""
-        self.widget.execute_button.checkbox.setCheckState(False)
+        self.widget.autobox.setCheckState(False)
         self.widget.text.setPlainText("temp = 42\nprint(temp)")
-        self.widget.execute_button.button.click()
+        self.widget.execute_button.click()
         self.assertIn("42", self.widget.console.toPlainText())
         self.widget.text.setPlainText("print(temp)")
-        self.widget.execute_button.button.click()
+        self.widget.execute_button.click()
         self.assertNotIn("NameError: name 'temp' is not defined",
                          self.widget.console.toPlainText())
 
@@ -57,7 +57,7 @@ def test_wrong_outputs(self):
         Error is shown when output variables are filled with wrong variable
         types and also output variable is set to None. (GH-2308)
         """
-        self.widget.execute_button.checkbox.setCheckState(False)
+        self.widget.autobox.setCheckState(False)
         self.assertEqual(len(self.widget.Error.active), 0)
         for signal, data in (
                 ("Data", self.iris),
@@ -66,22 +66,22 @@ def test_wrong_outputs(self):
             lsignal = signal.lower()
             self.send_signal(signal, data, (1, ))
             self.widget.text.setPlainText("out_{} = 42".format(lsignal))
-            self.widget.execute_button.button.click()
+            self.widget.execute_button.click()
             self.assertEqual(self.get_output(lsignal), None)
             self.assertTrue(hasattr(self.widget.Error, lsignal))
             self.assertTrue(getattr(self.widget.Error, lsignal).is_shown())
 
             self.widget.text.setPlainText("out_{0} = in_{0}".format(lsignal))
-            self.widget.execute_button.button.click()
+            self.widget.execute_button.click()
             self.assertIs(self.get_output(signal), data)
             self.assertFalse(getattr(self.widget.Error, lsignal).is_shown())
 
     def test_owns_errors(self):
         self.assertIsNot(self.widget.Error, OWWidget.Error)
 
     def test_multiple_signals(self):
-        self.widget.execute_button.checkbox.setCheckState(False)
-        click = self.widget.execute_button.button.click
+        self.widget.autobox.setCheckState(False)
+        click = self.widget.execute_button.click
         console_locals = self.widget.console.locals
 
         titanic = Table("titanic")