Added unattended tests with multiple versions of WinPython

Tested with:
WinPython-32bit-2.7.6.4
WinPython-64bit-2.7.6.4
WinPython-64bit-3.4.4.3
WinPython-64bit-3.4.4.3Qt5
WPy64-3680
WPy64-3771
WPy64-3830

Author: PierreRaybaut

basic_test.bat

@@ -0,0 +1,19 @@
+@echo off
+
+setlocal
+set PYTHONPATH=%cd%
+set TEST_UNATTENDED=1
+
+for /f %%f in ('dir /b c:\w*') do (call :test %%f)
+pause
+
+exit /B %ERRORLEVEL%
+
+:test
+set ENV=C:\%~1\scripts\env.bat
+if exist %ENV% (
+    echo ************************** Testing with %~1 **************************
+    call %ENV%
+    python -m qwt.tests.__init__
+    )
+exit /B 0

qwt/tests/BodeDemo.py

@@ -10,15 +10,12 @@
 
 SHOW = True # Show test in GUI-based test launcher
 
-import sys
 import numpy as np
 
-from qwt.qt.QtGui import (QApplication, QPen, QBrush, QFrame, QFont, QWidget,
-                          QMainWindow, QToolButton, QIcon, QPixmap, QToolBar,
-                          QHBoxLayout, QLabel, QPrinter, QPrintDialog,
-                          QFontDatabase)
-from qwt.qt.QtCore import QSize
-from qwt.qt.QtCore import Qt
+from qwt.qt.QtGui import (QPen, QBrush, QFrame, QFont, QWidget, QMainWindow,
+                          QToolButton, QIcon, QPixmap, QToolBar, QHBoxLayout,
+                          QLabel, QPrinter, QPrintDialog)
+from qwt.qt.QtCore import QSize, Qt
 from qwt import (QwtPlot, QwtPlotMarker, QwtSymbol, QwtLegend, QwtPlotGrid,
                  QwtPlotCurve, QwtPlotItem, QwtLogScaleEngine, QwtText,
                  QwtPlotRenderer)
@@ -281,19 +278,6 @@ def selected(self, _):
         self.showInfo()
 
 
-def make():
-    demo = BodeDemo()
-    demo.resize(540, 400)
-    demo.show()
-    return demo
-
-
 if __name__ == '__main__':
-    app = QApplication(sys.argv)
-    fonts = QFontDatabase()
-    for name in ('Verdana', 'STIXGeneral'):
-        if name in fonts.families():
-            app.setFont(QFont(name))
-            break
-    demo = make()
-    sys.exit(app.exec_())
+    from qwt.tests import test_widget
+    app = test_widget(BodeDemo, (540, 400))

qwt/tests/CPUplot.py

@@ -9,13 +9,10 @@
 SHOW = True # Show test in GUI-based test launcher
 
 import os
-import sys
 import numpy as np
 
-from qwt.qt.QtGui import (QApplication, QColor, QBrush, QWidget, QVBoxLayout,
-                          QLabel)
-from qwt.qt.QtCore import QRect, QTime
-from qwt.qt.QtCore import Qt
+from qwt.qt.QtGui import QColor, QBrush, QWidget, QVBoxLayout, QLabel
+from qwt.qt.QtCore import QRect, QTime, Qt
 from qwt import (QwtPlot, QwtPlotMarker, QwtScaleDraw, QwtLegend, QwtPlotCurve,
                  QwtPlotItem, QwtLegendData, QwtText)
 
@@ -176,20 +173,20 @@ def __init__(self):
 
     def statistic(self):
         values = self.__lookup()
-        userDelta = 0.0
+        userDelta = 0.
         for i in [CpuStat.User, CpuStat.Nice]:
             userDelta += (values[i] - self.procValues[i])
         systemDelta = values[CpuStat.System] - self.procValues[CpuStat.System]
-        totalDelta = 0.0
+        totalDelta = 0.
         for i in range(len(self.procValues)):
             totalDelta += (values[i] - self.procValues[i])
         self.procValues = values
-        return 100.0*userDelta/totalDelta, 100.0*systemDelta/totalDelta
+        return 100.*userDelta/totalDelta, 100.*systemDelta/totalDelta
 
     def upTime(self):
         result = QTime()
         for item in self.procValues:
-            result = result.addSecs(item/100)
+            result = result.addSecs(int(.01*item))
         return result
 
     def __lookup(self):
@@ -208,7 +205,7 @@ def __lookup(self):
 class CpuPieMarker(QwtPlotMarker):
     def __init__(self, *args):
         QwtPlotMarker.__init__(self, *args)
-        self.setZ(1000.0)
+        self.setZ(1000.)
         self.setRenderHint(QwtPlotItem.RenderAntialiased, True)
 
     def rtti(self):
@@ -219,18 +216,18 @@ def draw(self, painter, xMap, yMap, rect):
         pieRect = QRect()
         pieRect.setX(rect.x() + margin)
         pieRect.setY(rect.y() + margin)
-        pieRect.setHeight(yMap.transform(80.0))
+        pieRect.setHeight(int(yMap.transform(80.)))
         pieRect.setWidth(pieRect.height())
 
         angle = 3*5760/4
         for key in ["User", "System", "Idle"]:
             curve = self.plot().cpuPlotCurve(key)
             if curve.dataSize():
-                value = int(5760*curve.sample(0).y()/100.0)
+                value = int(5760*curve.sample(0).y()/100.)
                 painter.save()
                 painter.setBrush(QBrush(curve.pen().color(),
                                               Qt.SolidPattern))
-                painter.drawPie(pieRect, -angle, -value)
+                painter.drawPie(pieRect, int(-angle), int(-value))
                 painter.restore()
                 angle += value
 
@@ -248,7 +245,7 @@ def label(self, value):
 class Background(QwtPlotItem):
     def __init__(self):
         QwtPlotItem.__init__(self)
-        self.setZ(0.0)
+        self.setZ(0.)
 
     def rtti(self):
         return QwtPlotItem.Rtti_PlotUserItem
@@ -258,8 +255,8 @@ def draw(self, painter, xMap, yMap, rect):
         r = QRect(rect)
 
         for i in range(100, 0, -10):
-            r.setBottom(yMap.transform(i - 10))
-            r.setTop(yMap.transform(i))
+            r.setBottom(int(yMap.transform(i - 10)))
+            r.setTop(int(yMap.transform(i)))
             painter.fillRect(r, c)
             c = c.darker(110)
 
@@ -285,7 +282,7 @@ def __init__(self, *args):
 
         self.curves = {}
         self.data = {}
-        self.timeData = 1.0 * np.arange(HISTORY-1, -1, -1)
+        self.timeData = 1. * np.arange(HISTORY-1, -1, -1)
         self.cpuStat = CpuStat()
 
         self.setAutoReplot(False)
@@ -300,7 +297,7 @@ def __init__(self, *args):
         self.setAxisScaleDraw(
             QwtPlot.xBottom, TimeScaleDraw(self.cpuStat.upTime()))
         self.setAxisScale(QwtPlot.xBottom, 0, HISTORY)
-        self.setAxisLabelRotation(QwtPlot.xBottom, -50.0)
+        self.setAxisLabelRotation(QwtPlot.xBottom, -50.)
         self.setAxisLabelAlignment(
             QwtPlot.xBottom, Qt.AlignLeft | Qt.AlignBottom)
 
@@ -321,21 +318,21 @@ def __init__(self, *args):
 
         curve = CpuCurve('User')
         curve.setColor(Qt.blue)
-        curve.setZ(curve.z() - 1.0)
+        curve.setZ(curve.z() - 1.)
         curve.attach(self)
         self.curves['User'] = curve
         self.data['User'] = np.zeros(HISTORY, np.float)
 
         curve = CpuCurve('Total')
         curve.setColor(Qt.black)
-        curve.setZ(curve.z() - 2.0)
+        curve.setZ(curve.z() - 2.)
         curve.attach(self)
         self.curves['Total'] = curve
         self.data['Total'] = np.zeros(HISTORY, np.float)
 
         curve = CpuCurve('Idle')
         curve.setColor(Qt.darkCyan)
-        curve.setZ(curve.z() - 3.0)
+        curve.setZ(curve.z() - 3.)
         curve.attach(self)
         self.curves['Idle'] = curve
         self.data['Idle'] = np.zeros(HISTORY, np.float)
@@ -355,9 +352,9 @@ def timerEvent(self, e):
             data[1:] = data[0:-1]
         self.data["User"][0], self.data["System"][0] = self.cpuStat.statistic()
         self.data["Total"][0] = self.data["User"][0] + self.data["System"][0]
-        self.data["Idle"][0] = 100.0 - self.data["Total"][0]
+        self.data["Idle"][0] = 100. - self.data["Total"][0]
 
-        self.timeData += 1.0
+        self.timeData += 1.
 
         self.setAxisScale(
             QwtPlot.xBottom, self.timeData[-1], self.timeData[0])
@@ -375,25 +372,18 @@ def cpuPlotCurve(self, key):
         return self.curves[key]
 
 
-def make():
-    demo = QWidget()
-    demo.setWindowTitle('Cpu Plot')
-    
-    plot = CpuPlot(demo)
-    plot.setTitle("History")
-    
-    label = QLabel("Press the legend to en/disable a curve", demo)
-
-    layout = QVBoxLayout(demo)
-    layout.addWidget(plot)
-    layout.addWidget(label)
-
-    demo.resize(600, 400)
-    demo.show()
-    return demo
-
+class CpuWidget(QWidget):
+    def __init__(self, parent=None):
+        super(CpuWidget, self).__init__(parent)
+        layout = QVBoxLayout()
+        self.setLayout(layout)
+        plot = CpuPlot()
+        plot.setTitle("History")
+        layout.addWidget(plot)
+        label = QLabel("Press the legend to en/disable a curve")
+        layout.addWidget(label)
+        
 
 if __name__ == '__main__':
-    app = QApplication(sys.argv)
-    demo = make()
-    sys.exit(app.exec_())
+    from qwt.tests import test_widget
+    app = test_widget(CpuWidget, (600, 400))

qwt/tests/CartesianDemo.py

@@ -8,10 +8,9 @@
 
 SHOW = True # Show test in GUI-based test launcher
 
-import sys
 import numpy as np
 
-from qwt.qt.QtGui import QApplication, QPen
+from qwt.qt.QtGui import QPen
 from qwt.qt.QtCore import Qt
 from qwt import QwtPlot, QwtScaleDraw, QwtPlotGrid, QwtPlotCurve, QwtPlotItem
 
@@ -89,14 +88,6 @@ def __init__(self, *args):
         self.replot()
 
 
-def make():
-    demo = CartesianPlot()
-    demo.resize(400, 300)
-    demo.show()
-    return demo
-
-
 if __name__ == '__main__':
-    app = QApplication(sys.argv)
-    demo = make()
-    sys.exit(app.exec_())
+    from qwt.tests import test_widget
+    test_widget(CartesianPlot, (400, 300))

qwt/tests/CurveBenchmark.py

@@ -10,11 +10,9 @@
 
 import time
 import numpy as np
-import sys
 
 from qwt.qt.QtGui import (QApplication, QPen, QMainWindow, QGridLayout,
-                          QTabWidget, QWidget, QTextEdit, QLineEdit, QFont,
-                          QFontDatabase)
+                          QTabWidget, QWidget, QTextEdit, QLineEdit)
 from qwt.qt.QtCore import Qt
 
 import os
@@ -78,7 +76,7 @@ def params(self, *args, **kwargs):
                     )
 
     def setup(self, points, *args, **kwargs):
-        x = np.linspace(.001, 20., points)
+        x = np.linspace(.001, 20., int(points))
         y = (np.sin(x)/x)*np.cos(20*x)
         layout = QGridLayout()
         nbcol, col, row = 2, 0, 0
@@ -121,11 +119,11 @@ def __init__(self, parent=None, title=None):
 """ % (title, library))
 
 
-class BMDemo(QMainWindow):
+class BMDemo1(QMainWindow):
     TITLE = 'Curve benchmark'
     SIZE = (1000, 800)
-    def __init__(self, max_n, parent=None, **kwargs):
-        super(BMDemo, self).__init__(parent=parent)
+    def __init__(self, max_n=1000000, parent=None, **kwargs):
+        super(BMDemo1, self).__init__(parent=parent)
         title = self.TITLE
         if kwargs.get('only_lines', False):
             title = '%s (%s)' % (title, 'only lines')
@@ -169,13 +167,5 @@ def run_benchmark(self, max_n, **kwargs):
 
 
 if __name__ == '__main__':
-    app = QApplication([])
-    for name in ('Calibri', 'Verdana', 'Arial'):
-        if name in QFontDatabase().families():
-            app.setFont(QFont(name))
-            break
-    kwargs = {}
-    for arg in sys.argv[1:]:
-        kwargs[arg] = True
-    demo = BMDemo(1000000, **kwargs)
-    app.exec_()
+    from qwt.tests import test_widget
+    app = test_widget(BMDemo1)

qwt/tests/CurveDemo1.py

@@ -8,17 +8,15 @@
 
 SHOW = True # Show test in GUI-based test launcher
 
-import sys
 import numpy as np
 
-from qwt.qt.QtGui import (QApplication, QPen, QBrush, QFrame, QFont, QPainter,
-                          QPaintEngine)
+from qwt.qt.QtGui import QPen, QBrush, QFrame, QFont, QPainter, QPaintEngine
 from qwt.qt.QtCore import QSize
 from qwt.qt.QtCore import Qt
 from qwt import QwtSymbol, QwtPlotCurve, QwtPlotItem, QwtScaleMap
 
 
-class CurveDemo(QFrame):
+class CurveDemo1(QFrame):
     def __init__(self, *args):
         QFrame.__init__(self, *args)
 
@@ -118,14 +116,6 @@ def drawContents(self, painter):
             self.shiftDown(r, dy)
 
 
-def make():
-    demo = CurveDemo()
-    demo.resize(300, 600)
-    demo.show()
-    return demo
-
-
 if __name__ == '__main__':
-    app = QApplication(sys.argv)
-    demo = make()
-    sys.exit(app.exec_())
+    from qwt.tests import test_widget
+    app = test_widget(CurveDemo1, size=(300, 600))