From 94e457885c8338c487204bdcdb3746c3e8889f77 Mon Sep 17 00:00:00 2001
From: Eric Dill <edill@bnl.gov>
Date: Fri, 31 Jul 2015 14:39:32 -0400
Subject: [PATCH] TST: How about we don't over-engineer a solution

---
 .../ViewBox/tests/test_ViewBox.py             | 141 ++++++++----------
 1 file changed, 65 insertions(+), 76 deletions(-)

diff --git a/pyqtgraph/graphicsItems/ViewBox/tests/test_ViewBox.py b/pyqtgraph/graphicsItems/ViewBox/tests/test_ViewBox.py
index d0b7871f..34e65292 100644
--- a/pyqtgraph/graphicsItems/ViewBox/tests/test_ViewBox.py
+++ b/pyqtgraph/graphicsItems/ViewBox/tests/test_ViewBox.py
@@ -1,84 +1,18 @@
 #import PySide
 import pyqtgraph as pg
-import pytest
 
-QRectF = pg.QtCore.QRectF
-qtest = pg.Qt.QtTest.QTest
 app = pg.mkQApp()
-win = None
-vb = None
+qtest = pg.Qt.QtTest.QTest
 
-
-def test_resize():
-    global app, win, vb
-    # test resize
-    win.resize(400, 400)
-    app.processEvents()
-    w = vb.geometry().width()
-    h = vb.geometry().height()
-    view1 = QRectF(0, 0, 10, 10)
-    size1 = QRectF(0, h, w, -h)
-    size1 = QRectF(0, h, w, -h)
-    _assert_mapping(vb, view1, size1)
-
-
-def test_wide_resize():
-    global app, win, vb
-    win.resize(400,400)
-    vb.setAspectLocked()
-    # test wide resize
-    win.resize(800, 400)
-    app.processEvents()
-    w = vb.geometry().width()
-    h = vb.geometry().height()
-    view1 = QRectF(-5, 0, 20, 10)
-    size1 = QRectF(0, h, w, -h)
-    _assert_mapping(vb, view1, size1)
-
-
-def test_tall_resize():
-    global app, win, vb
-    # test tall resize
-    win.resize(400, 800)
-    app.processEvents()
-    w = vb.geometry().width()
-    h = vb.geometry().height()
-    view1 = QRectF(0, -5, 10, 20)
-    size1 = QRectF(0, h, w, -h)
-    _assert_mapping(vb, view1, size1)
-
-
-skipreason = ('unclear why these tests are failing. skipping until someone '
-              'has time to fix it.')
-# @pytest.mark.skipif(True, reason=skipreason)
-def test_aspect_ratio_constraint():
-    # test limits + resize  (aspect ratio constraint has priority over limits
-    win.resize(400, 400)
-    app.processEvents()
-    vb.setLimits(xMin=0, xMax=10, yMin=0, yMax=10)
-    win.resize(800, 400)
-    app.processEvents()
-    w = vb.geometry().width()
-    h = vb.geometry().height()
-    view1 = QRectF(-5, 0, 20, 10)
-    size1 = QRectF(0, h, w, -h)
-    _assert_mapping(vb, view1, size1)
-
-
-def _assert_mapping(vb, r1, r2):
+def assertMapping(vb, r1, r2):
     assert vb.mapFromView(r1.topLeft()) == r2.topLeft()
     assert vb.mapFromView(r1.bottomLeft()) == r2.bottomLeft()
     assert vb.mapFromView(r1.topRight()) == r2.topRight()
     assert vb.mapFromView(r1.bottomRight()) == r2.bottomRight()
 
-
-
-function_set = set([test_resize, test_wide_resize, test_tall_resize,
-                    test_aspect_ratio_constraint])
-                    
-@pytest.mark.parametrize('function', function_set)
-def setup_function(function):
+def test_ViewBox():
     global app, win, vb
+    QRectF = pg.QtCore.QRectF
     
     win = pg.GraphicsWindow()
     win.ci.layout.setContentsMargins(0,0,0,0)
@@ -95,20 +29,75 @@ def setup_function(function):
     g = pg.GridItem()
     vb.addItem(g)
     
+    app.processEvents()
+    
     w = vb.geometry().width()
     h = vb.geometry().height()
     view1 = QRectF(0, 0, 10, 10)
     size1 = QRectF(0, h, w, -h)
-    _assert_mapping(vb, view1, size1)
+    assertMapping(vb, view1, size1)
     
+    # test resize
     win.resize(400, 400)
+    app.processEvents()
+    w = vb.geometry().width()
+    h = vb.geometry().height()
+    size1 = QRectF(0, h, w, -h)
+    assertMapping(vb, view1, size1)
     
+    # now lock aspect
     vb.setAspectLocked()
+    
+    # test wide resize
     win.resize(800, 400)
     app.processEvents()
+    w = vb.geometry().width()
+    h = vb.geometry().height()
+    view1 = QRectF(-5, 0, 20, 10)
+    size1 = QRectF(0, h, w, -h)
+    assertMapping(vb, view1, size1)
+    
+    # test tall resize
+    win.resize(400, 800)
+    app.processEvents()
+    w = vb.geometry().width()
+    h = vb.geometry().height()
+    view1 = QRectF(0, -5, 10, 20)
+    size1 = QRectF(0, h, w, -h)
+    assertMapping(vb, view1, size1)
 
-@pytest.mark.parametrize('function', function_set)
-def teardown_function(function):
-    global win, vb
-    win = None
-    vb = None
+
+def test_limits_and_resize():
+    global app, win, vb
+    QRectF = pg.QtCore.QRectF
+    
+    win = pg.GraphicsWindow()
+    win.ci.layout.setContentsMargins(0,0,0,0)
+    win.resize(200, 200)
+    win.show()
+    vb = win.addViewBox()
+    
+    # set range before viewbox is shown
+    vb.setRange(xRange=[0, 10], yRange=[0, 10], padding=0)
+    
+    # required to make mapFromView work properly.
+    qtest.qWaitForWindowShown(win)
+    
+    g = pg.GridItem()
+    vb.addItem(g)
+    
+    app.processEvents()
+    
+    # now lock aspect
+    vb.setAspectLocked()
+    # test limits + resize  (aspect ratio constraint has priority over limits
+    win.resize(400, 400)
+    app.processEvents()
+    vb.setLimits(xMin=0, xMax=10, yMin=0, yMax=10)
+    win.resize(800, 400)
+    app.processEvents()
+    w = vb.geometry().width()
+    h = vb.geometry().height()
+    view1 = QRectF(-5, 0, 20, 10)
+    size1 = QRectF(0, h, w, -h)
+    assertMapping(vb, view1, size1)