reverted to previous version using asserts; changed unittest setUp/tearDown to pytest naming setup_method/teardown_method

tests/test_mdiarea.py

@@ -1,5 +1,4 @@
 import sys
-import unittest
 from unittest import mock
 
 from grum.mainwin import MainWindow
@@ -11,20 +10,20 @@ from PyQt5.QtGui import QPainter
 from PyQt5.QtWidgets import QApplication, QMdiArea
 
 
-class TestViewUnit(unittest.TestCase):
+class TestMDIArea:
 
-    def setUp(self) -> None:
-#        print("setup")
+    def setup_method(self):
+        print("setup")
         self.app = QApplication(sys.argv)
         self.mw = MainWindow(add_examples=True)
         self.mw.show()
 
 
-    def tearDown(self) -> None:
-#        print("teardown")
+    def teardown_method(self):
+        print("teardown")
         self.mw.rst.wait_for_stop()
         self.app.quit()
-#        print("app quit called")
+        print("app quit called")
         del self.mw
         del self.app
 
@@ -35,17 +34,11 @@ class TestViewUnit(unittest.TestCase):
         mdi.enable_subwindow_view = mock.MagicMock()
         mdi.cascadeSubWindows = mock.MagicMock()
         mdi.menu.checkboxes["Multiple windows"].setChecked(False)
-
-        self.assertFalse(
-            mdi.menu.checkboxes["Multiple windows"].isChecked()
-        )
+        assert mdi.menu.checkboxes["Multiple windows"].isChecked() == False
 
         mdi.on_cascade()
 
-        self.assertTrue(
-            mdi.menu.checkboxes["Multiple windows"].isChecked()
-        )
-
+        assert mdi.menu.checkboxes["Multiple windows"].isChecked() == True
         mdi.enable_subwindow_view.assert_called_once()
         mdi.cascadeSubWindows.assert_called_once()
 
@@ -56,17 +49,11 @@ class TestViewUnit(unittest.TestCase):
         mdi.enable_subwindow_view = mock.MagicMock()
         mdi.tileSubWindows = mock.MagicMock()
         mdi.menu.checkboxes["Multiple windows"].setChecked(False)
-
-        self.assertFalse(
-            mdi.menu.checkboxes["Multiple windows"].isChecked()
-        )
+        assert mdi.menu.checkboxes["Multiple windows"].isChecked() == False
 
         mdi.on_tile()
 
-        self.assertTrue(
-            mdi.menu.checkboxes["Multiple windows"].isChecked()
-        )
-
+        assert mdi.menu.checkboxes["Multiple windows"].isChecked() == True
         mdi.enable_subwindow_view.assert_called_once()
         mdi.tileSubWindows.assert_called_once()
 
@@ -76,20 +63,14 @@ class TestViewUnit(unittest.TestCase):
         mdi.enable_subwindow_view = mock.MagicMock()
         mdi.closeInactiveSubWindows = mock.MagicMock()
         active = mdi.activeSubWindow()
-
-        self.assertIsNone(
-            mdi.activeSubWindow()
-        )
+        assert  mdi.activeSubWindow() == None
 
         sine_item = self.mw.lst.lst.get("sine")
         sub = MDISubPlot("sine", sine_item.value)
         mdi.addSubWindow(sub)
-        mdi.setActiveSubWindow(sub)
+        mdi.setActiveSubWindow(MDISubWindow("sine"))
 
-        #TODO: check this
-#        self.assertIsNotNone(
-#            mdi.activeSubWindow()
-#        )
+        # assert  mdi.activeSubWindow() != None #TODO: check this!
 
         mdi.enable_single_window_mode()
 
@@ -127,25 +108,18 @@ class TestViewUnit(unittest.TestCase):
 
 
     def test_add(self):
-        mdi =self.mw.mdi
-
+        mdi = self.mw.mdi
         sine_item = self.mw.lst.lst.get("sine")
         sub = MDISubPlot("sine", sine_item.value)
         mdi.add_multiple = mock.MagicMock()
         mdi.add_single = mock.MagicMock()
-
-        self.assertFalse(
-            mdi.menu.checkboxes["Single window"].isChecked()
-        )
+        assert mdi.menu.checkboxes["Single window"].isChecked() == False
 
         mdi.add(sub)
         mdi.add_multiple.assert_called_once_with(sub)
 
         mdi.menu.checkboxes['Single window'].setChecked(True)
-
-        self.assertTrue(
-            mdi.menu.checkboxes["Single window"].isChecked()
-        )
+        assert mdi.menu.checkboxes["Single window"].isChecked() == True
 
         mdi.add(sub)
         mdi.add_single.assert_called_once_with(sub)
@@ -196,15 +170,11 @@ class TestViewUnit(unittest.TestCase):
 
         ret = mdi.findSubWindow('sine')
 
-        self.assertEqual(
-            ret, sub
-        )
+        assert ret == sub
 
         ret = mdi.findSubWindow('cosine')
 
-        self.assertIsNone(
-            ret
-        )
+        assert ret == None
 
 
     def test_closeInactiveSubWindows(self):
@@ -221,11 +191,7 @@ class TestViewUnit(unittest.TestCase):
         mdi.closeInactiveSubWindows()
 
         active = mdi.activeSubWindow()
-
-        self.assertEqual(
-            active, cosine_sub
-        )
-
+        assert active == cosine_sub
         for sub in mdi.subWindowList():
             if sub != active:
                 sub.close.assert_called_once()