Merge pull request tpaviot#930 from tpaviot/review/gui-tests

tpaviot · web-flow · commit ca6d98963a4b · 2020-12-01T09:12:40.000+01:00
Review/gui tests
diff --git a/ci/conda/meta.yaml b/ci/conda/meta.yaml
@@ -40,6 +40,8 @@ test:
     - pyqt >=5
     - mypy
     - svgwrite
+    - wxpython >=4
+    - pyside2 >=5
 
 about:
   home: https://github.com/tpaviot/pythonocc-core
diff --git a/ci/conda/run_test.sh b/ci/conda/run_test.sh
@@ -6,4 +6,6 @@ mypy test_mypy_classic_occ_bottle.py
 if [ $(uname) == Linux ]; then
     # start xvfb
     xvfb-run --auto-servernum --server-args='-screen 0, 1024x768x24' python core_display_pyqt5_unittest.py
-fi
+    xvfb-run --auto-servernum --server-args='-screen 0, 1024x768x24' python core_display_pyside2_unittest.py
+    xvfb-run --auto-servernum --server-args='-screen 0, 1024x768x24' python core_display_wx_unittest.py
+fi
diff --git a/test/core_display_pyqt4_unittest.py b/test/core_display_pyqt4_unittest.py
diff --git a/test/core_display_pyqt5_unittest.py b/test/core_display_pyqt5_unittest.py
@@ -17,7 +17,6 @@
 ##You should have received a copy of the GNU Lesser General Public License
 ##along with pythonOCC.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
 import sys
 
 from OCC.Display.backend import load_pyqt5
@@ -29,7 +28,8 @@
     print("pyqt5 required to run this test")
     sys.exit()
 
-print('pyqt5 test')
+print('pyqt5 test running ...')
 pyqt5_display, start_display, add_menu, add_function_to_menu = init_display('qt-pyqt5')
-my_box_1 = BRepPrimAPI_MakeBox(10., 20., 30.).Shape()
-pyqt5_display.DisplayShape(my_box_1, update=True)
+my_box = BRepPrimAPI_MakeBox(10., 20., 30.).Shape()
+pyqt5_display.DisplayShape(my_box, update=True)
+print('pyqt5 test ok.')
diff --git a/test/core_display_pyside2_unittest.py b/test/core_display_pyside2_unittest.py
@@ -17,19 +17,19 @@
 ##You should have received a copy of the GNU Lesser General Public License
 ##along with pythonOCC.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
 import sys
 
-from OCC.Display.backend import load_pyside
+from OCC.Display.backend import load_pyside2
 from OCC.Display.SimpleGui import init_display
 from OCC.Core.BRepPrimAPI import BRepPrimAPI_MakeBox
 
 # check for pyside
-if not load_pyside():
-    print("pyside required to run this test")
+if not load_pyside2():
+    print("pyside2 required to run this test")
     sys.exit()
 
-print('pyside test')
-pyside_display, start_display, add_menu, add_function_to_menu = init_display('qt-pyside')
-my_box_1 = BRepPrimAPI_MakeBox(10., 20., 30.).Shape()
-pyside_display.DisplayShape(my_box_1, update=True)
+print('pyside2 test running ...')
+pyside2_display, start_display, add_menu, add_function_to_menu = init_display('qt-pyside2')
+my_box = BRepPrimAPI_MakeBox(10., 20., 30.).Shape()
+pyside2_display.DisplayShape(my_box, update=True)
+print('pyside2 test ok.')
diff --git a/test/core_display_wx_unittest.py b/test/core_display_wx_unittest.py
@@ -17,7 +17,6 @@
 ##You should have received a copy of the GNU Lesser General Public License
 ##along with pythonOCC.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
 import sys
 
 from OCC.Display.backend import load_wx
@@ -29,7 +28,8 @@
     print("wx required to run this test")
     sys.exit()
 
-print('wx test')
+print('wx test running ...')
 wx_display, start_display, add_menu, add_function_to_menu = init_display('wx')
-my_box_1 = BRepPrimAPI_MakeBox(10., 20., 30.).Shape()
-wx_display.DisplayShape(my_box_1, update=True)
+my_box = BRepPrimAPI_MakeBox(10., 20., 30.).Shape()
+wx_display.DisplayShape(my_box, update=True)
+print('wx test ok.')
