Merge pull request #7 from sumagnadas/dependabot/pip/pyside2-5.15.0

Bump pyside2 from 5.14.2 to 5.15.0

Author: sumagnadas

.travis.yml

@@ -36,15 +36,20 @@ jobs:
 addons:
   apt:
     packages:
-      - build-essential
-      - libssl-dev
-      - libffi-dev
       - x11-utils
       - libxkbcommon-x11-0
+      - libxcb-keysyms1-dev
+      - libx11-xcb-dev
+      - libxcb-xinerama0-dev
+      - libxcb-randr0-dev
+      - libxcb-render0-dev
+      - libxcb-image0-dev
+      - libxcb-icccm4-dev
+      - libxcb-render-util0-dev
 install:
   - if [ "$TRAVIS_OS_NAME" = "windows" ]; then py -m pip install -r requirements.txt; fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then pip3 install -r requirements.txt; fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export DISPLAY=:99.0; /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1920x1200x24 -ac +extension GLX +render -noreset;sleep 3;pip3 install -r requirements.txt; fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then pip3 install -r requirements.txt; fi
 script:
-  - coverage run -m pytest -vxrs
+  - pytest -vxrs --cov=./
   - codecov

requirements.txt

@@ -8,11 +8,12 @@ pluggy==0.13.1
 py==1.8.2
 pycodestyle==2.6.0
 pyparsing==2.4.7
-PySide2==5.14.2
+PySide2==5.15.0
 pytest==5.4.3
 pytest-qt==3.3.0
-shiboken2==5.14.2
+shiboken2==5.15.0
 wcwidth==0.1.9
 zipp==3.1.0
 codecov==2.1.7
 coverage==5.1
+pytest-cov==2.10.0

tests/test_button.py

@@ -1,21 +1,15 @@
 import pytestqt
-from modules.gui import Graph, QtWidgets, QtGui
+from modules.gui import Graph, QtGui, QtWidgets
 from modules.geometry import dist, Point
 from modules import configureImage
 from PySide2.QtCore import Qt, QPoint
 from os import path
 
-app = QtWidgets.QApplication()
-rect = app.primaryScreen().availableGeometry()
-WIDTH = int(rect.width() * (43.92 / 100))
-HEIGHT = int(rect.height() * (80.97 / 100))
+def test_coordBox(qtbot, qapp):
+    print(qapp.instance())
+    window = Graph()
+    window.setImage(QtGui.QImage("resources/graph.png"))
 
-image = configureImage(WIDTH, HEIGHT)
-window = Graph()
-window.setImage(image)
-
-def test_coordBox(qtbot):
-    window.show()
     str = ('Empty '
            'input box should be taken as zero')
 
@@ -30,8 +24,9 @@ def test_coordBox(qtbot):
         assert i[0].text() == '0', str
         assert i[1].text() == '0', str
 
-def test_draw(qtbot):
-    window.show()
+def test_draw(qtbot, qapp):
+    window = Graph()
+    window.setImage(QtGui.QImage("resources/graph.png"))
 
     window.x_coord1.setText('10')
     window.y_coord1.setText('10')
@@ -40,8 +35,7 @@ def test_draw(qtbot):
     qtbot.waitForWindowShown(window)
 
     qtbot.mouseClick(window.buttonBox.buttons()[0], Qt.LeftButton)
-    graph = window.image.grab().toImage()
-    app.exit()
+    graph = window.graph_image
     for i in range(-20, 20):
         for j in range(-20, 20):
             p = Point(i, j)
@@ -51,12 +45,15 @@ def test_draw(qtbot):
                                                              'not working')
 
 
-def test_save(qtbot, tmpdir_factory):
+def test_save(qtbot, qapp, tmpdir_factory):
+    window = Graph()
+    window.setImage(QtGui.QImage("resources/graph.png"))
+
     window.x_coord1.setText('10')
     window.y_coord1.setText('10')
     window.x_coord2.setText('20')
     window.y_coord2.setText('20')
-    qtbot.waitForWindowShown(window)
+    window.setImage(QtGui.QImage("resources/graph.png"))
 
     window.beingTested = True
     fn = tmpdir_factory.mktemp("data")
@@ -67,7 +64,10 @@ def test_save(qtbot, tmpdir_factory):
     assert fn.join("img.png").check() is True, ('Save button '
                                                          'is not working')
 
-def test_intInput(qtbot):
+def test_intInput(qtbot, qapp):
+    window = Graph()
+    window.setImage(QtGui.QImage("resources/graph.png"))
+
     qtbot.addWidget(window)
     str = 'Coordinates input box is not supposed take in letter as input'
 
@@ -82,8 +82,11 @@ def test_intInput(qtbot):
         assert 'A' not in i[0].text(), str
         assert 'A' not in i[1].text(), str
 
-def test_bgchange(qtbot):
+def test_bgchange(qtbot, qapp):
+    WIDTH = 599
+    HEIGHT = 599
     image = configureImage(WIDTH, HEIGHT, backgroundcolour=Qt.red)
+
     gridColor = 0
     bgColor = 0
     image =  image.scaled(WIDTH, HEIGHT)
@@ -97,8 +100,11 @@ def test_bgchange(qtbot):
 
     assert (bgColor > gridColor) is True, 'Background colour of the graph is not getting changed'
 
-def test_gridchange(qtbot):
+def test_gridchange(qtbot, qapp):
+    WIDTH = 599
+    HEIGHT = 599
     image = configureImage(WIDTH, HEIGHT, gridcolour=Qt.red, backgroundcolour=Qt.transparent)
+
     gridColor = 0
     bgColor = 0
     image =  image.scaled(WIDTH, HEIGHT)

tests/test_misc.py

@@ -4,8 +4,9 @@
 from os import path
 
 
-window = Graph()
 def test_closedfigure(qtbot):
+    h = QtWidgets.QApplication.instance()
+    window = Graph()
     qtbot.addWidget(window)
     qtbot.mouseClick(window.addButton, Qt.LeftButton)
     window.buttonBox.buttons()[4].setCheckState(Qt.CheckState.Unchecked)
@@ -15,17 +16,23 @@ def test_closedfigure(qtbot):
     qtbot.mouseClick(window.input[-1].removeButton, Qt.LeftButton)
 
 def test_extrainfo(qtbot):
+    h = QtWidgets.QApplication.instance()
+    window = Graph()
     qtbot.addWidget(window)
     qtbot.mouseClick(window.extraInfo, Qt.LeftButton)
     assert window.shapeInfo.isHidden() == False, 'Extra Info is not being shown'
 
 def test_removebutton(qtbot):
+    h = QtWidgets.QApplication.instance()
+    window = Graph()
     oldRowCount = window.coordLayout.rowCount()
     qtbot.mouseClick(window.addButton, Qt.LeftButton)
     qtbot.mouseClick(window.input[-1].removeButton, Qt.LeftButton)
     assert window.coordLayout.rowCount() == oldRowCount, "\"Remove Point\" button is not working"
 
 def test_clear(qtbot):
+    h = QtWidgets.QApplication.instance()
+    window = Graph()
     window.x_coord1.setText('10')
     window.y_coord1.setText('10')
     window.x_coord2.setText('20')
@@ -39,5 +46,7 @@ def test_clear(qtbot):
     assert window.y_coord2.text() == '0', "Reset button is not working"
 
 def test_addbutton(qtbot):
+    h = QtWidgets.QApplication.instance()
+    window = Graph()
     qtbot.mouseClick(window.addButton, Qt.LeftButton)
     assert window.coordLayout.rowCount() == 4, "\"Add Point\" button is not working"