kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Draft: moved some unit tests to TestDraftGui

Browse Source 
Those unit tests that are registered in `Init.py` will always run,
while those that are registerd in `InitGui.py` will only run
when the graphical interface is available.

This allows us to more clearly distinguish functions that
should be able to run always, from those that may run only
when the interfce is available.
This commit is contained in:
vocx-fc
2020-03-10 18:14:36 -06:00
committed by Yorik van Havre
parent b74841a5b1
commit d40bf0d5e8
7 changed files with 119 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Mod/Draft/CMakeLists.txt
View File

@@ -17,6 +17,7 @@ SET(Draft_SRCS_base
WorkingPlane.py
getSVG.py
TestDraft.py
TestDraftGui.py
)
SET(Draft_import

2
src/Mod/Draft/InitGui.py
View File

@@ -174,3 +174,5 @@ FreeCADGui.addPreferencePage(":/ui/preferences-dxf.ui", QT_TRANSLATE_NOOP("Draft
FreeCADGui.addPreferencePage(":/ui/preferences-dwg.ui", QT_TRANSLATE_NOOP("Draft", "Import-Export"))
FreeCADGui.addPreferencePage(":/ui/preferences-svg.ui", QT_TRANSLATE_NOOP("Draft", "Import-Export"))
FreeCADGui.addPreferencePage(":/ui/preferences-oca.ui", QT_TRANSLATE_NOOP("Draft", "Import-Export"))
FreeCAD.__unit_test__ += ["TestDraftGui"]

24
src/Mod/Draft/TestDraft.py
View File

@@ -21,7 +21,7 @@
# * USA *
# * *
# ***************************************************************************
"""Unit tests for the Draft workbench.
"""Unit tests for the Draft workbench, non-GUI only.
From the terminal, run the following:
FreeCAD -t TestDraft
@@ -29,6 +29,8 @@ FreeCAD -t TestDraft
From within FreeCAD, run the following:
import Test, TestDraft
Test.runTestsFromModule(TestDraft)
For the GUI-only tests see TestDraftGui.
"""
# ===========================================================================
@@ -94,20 +96,17 @@ Test.runTestsFromModule(TestDraft)
# Import tests
from drafttests.test_import import DraftImport as DraftTest01
from drafttests.test_import_gui import DraftGuiImport as DraftTest02
from drafttests.test_import_tools import DraftImportTools as DraftTest03
from drafttests.test_pivy import DraftPivy as DraftTest04
# Objects tests
from drafttests.test_creation import DraftCreation as DraftTest05
from drafttests.test_modification import DraftModification as DraftTest06
from drafttests.test_creation import DraftCreation as DraftTest02
from drafttests.test_modification import DraftModification as DraftTest03
# Handling of file formats tests
from drafttests.test_svg import DraftSVG as DraftTest07
from drafttests.test_dxf import DraftDXF as DraftTest08
from drafttests.test_dwg import DraftDWG as DraftTest09
from drafttests.test_oca import DraftOCA as DraftTest10
from drafttests.test_airfoildat import DraftAirfoilDAT as DraftTest11
from drafttests.test_svg import DraftSVG as DraftTest04
from drafttests.test_dxf import DraftDXF as DraftTest05
from drafttests.test_dwg import DraftDWG as DraftTest06
from drafttests.test_oca import DraftOCA as DraftTest07
from drafttests.test_airfoildat import DraftAirfoilDAT as DraftTest08
# Use the modules so that code checkers don't complain (flake8)
True if DraftTest01 else False
@@ -118,6 +117,3 @@ True if DraftTest05 else False
True if DraftTest06 else False
True if DraftTest07 else False
True if DraftTest08 else False
True if DraftTest09 else False
True if DraftTest10 else False
True if DraftTest11 else False

105
src/Mod/Draft/TestDraftGui.py Normal file
View File

@@ -0,0 +1,105 @@
# ***************************************************************************
# * Copyright (c) 2013 Yorik van Havre <yorik@uncreated.net> *
# * Copyright (c) 2020 Eliud Cabrera Castillo <e.cabrera-castillo@tum.de> *
# * *
# * This file is part of the FreeCAD CAx development system. *
# * *
# * This program is free software; you can redistribute it and/or modify *
# * it under the terms of the GNU Lesser General Public License (LGPL) *
# * as published by the Free Software Foundation; either version 2 of *
# * the License, or (at your option) any later version. *
# * for detail see the LICENCE text file. *
# * *
# * FreeCAD is distributed in the hope that it will be useful, *
# * but WITHOUT ANY WARRANTY; without even the implied warranty of *
# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
# * GNU Library General Public License for more details. *
# * *
# * You should have received a copy of the GNU Library General Public *
# * License along with FreeCAD; if not, write to the Free Software *
# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 *
# * USA *
# * *
# ***************************************************************************
"""Unit tests for the Draft workbench, GUI only.
From the terminal, run the following:
FreeCAD -t TestDraftGui
From within FreeCAD, run the following:
import Test, TestDraftGui
Test.runTestsFromModule(TestDraftGui)
For the non-GUI tests see TestDraft.
"""
# ===========================================================================
# The unit tests can be run from the operating system terminal, or from
# within FreeCAD itself.
#
# The tests can be run using the full 'FreeCAD' executable
# or the console only 'FreeCADCmd' executable. In the latter case
# some functions cannot be tested as the view providers (visual properties)
# are not available.
#
# ===========================================================================
# In the following, first the command to run the test from the operating
# system terminal is listed, followed by the commands to run the test
# from the Python console within FreeCAD.
#
# ===========================================================================
# Run all Draft tests
# ----
# FreeCAD -t TestDraft
#
# >>> import Test, TestDraft
# >>> Test.runTestsFromModule(TestDraft)
#
# ===========================================================================
# Run tests from a specific module (all classes within this module)
# ----
# FreeCAD -t drafttests.test_creation
#
# >>> import Test, drafttests.test_creation
# >>> Test.runTestsFromModule(drafttests.test_creation)
#
# ===========================================================================
# Run tests from a specific class within a module
# ----
# FreeCAD -t drafttests.test_creation.DraftCreation
#
# >>> import Test, drafttests.test_creation
# >>> Test.runTestsFromClass(drafttests.test_creation.DraftCreation)
#
# ===========================================================================
# Run a specific unit test from a class within a module
# ----
# FreeCAD -t drafttests.test_creation.DraftCreation.test_line
#
# >>> import unittest
# >>> one_test = "drafttests.test_creation.DraftCreation.test_line"
# >>> all_tests = unittest.TestLoader().loadTestsFromName(one_test)
# >>> unittest.TextTestRunner().run(all_tests)
# ===========================================================================
# When the full test is run
# FreeCAD -t TestDraft
#
# all classes that are found in this file are run.
#
# We import the classes from submodules. These classes contain
# the actual unit tests.
#
# The classes will be run in alphabetical order. So, to force
# a particular order of testing we import them with a name
# that follows a defined alphanumeric sequence.
# Import tests
from drafttests.test_import_gui import DraftGuiImport as DraftTestGui01
from drafttests.test_import_tools import DraftImportTools as DraftTestGui02
from drafttests.test_pivy import DraftPivy as DraftTestGui03
# Use the modules so that code checkers don't complain (flake8)
True if DraftTestGui01 else False
True if DraftTestGui02 else False
True if DraftTestGui03 else False

17
src/Mod/Draft/drafttests/test_import_gui.py
View File

@@ -24,7 +24,6 @@
"""Unit test for the Draft Workbench, GUI import tests."""
import unittest
import FreeCAD as App
import drafttests.auxiliary as aux
@@ -39,39 +38,23 @@ class DraftGuiImport(unittest.TestCase):
def test_import_gui_draftgui(self):
"""Import Draft TaskView GUI tools."""
module = "DraftGui"
if not App.GuiUp:
aux._no_gui(module)
self.assertTrue(True)
return
imported = aux._import_test(module)
self.assertTrue(imported, "Problem importing '{}'".format(module))
def test_import_gui_draft_snap(self):
"""Import Draft snapping."""
module = "draftguitools.gui_snapper"
if not App.GuiUp:
aux._no_gui(module)
self.assertTrue(True)
return
imported = aux._import_test(module)
self.assertTrue(imported, "Problem importing '{}'".format(module))
def test_import_gui_draft_tools(self):
"""Import Draft graphical commands."""
module = "DraftTools"
if not App.GuiUp:
aux._no_gui(module)
self.assertTrue(True)
return
imported = aux._import_test(module)
self.assertTrue(imported, "Problem importing '{}'".format(module))
def test_import_gui_draft_trackers(self):
"""Import Draft tracker utilities."""
module = "draftguitools.gui_trackers"
if not App.GuiUp:
aux._no_gui(module)
self.assertTrue(True)
return
imported = aux._import_test(module)
self.assertTrue(imported, "Problem importing '{}'".format(module))

21
src/Mod/Draft/drafttests/test_import_tools.py
View File

@@ -24,7 +24,6 @@
"""Unit test for the Draft Workbench, tools import tests."""
import unittest
import FreeCAD as App
import drafttests.auxiliary as aux
@@ -39,49 +38,29 @@ class DraftImportTools(unittest.TestCase):
def test_import_gui_draftedit(self):
"""Import Draft Edit."""
module = "draftguitools.gui_edit"
if not App.GuiUp:
aux._no_gui(module)
self.assertTrue(True)
return
imported = aux._import_test(module)
self.assertTrue(imported, "Problem importing '{}'".format(module))
def test_import_gui_draftfillet(self):
"""Import Draft Fillet."""
module = "DraftFillet"
if not App.GuiUp:
aux._no_gui(module)
self.assertTrue(True)
return
imported = aux._import_test(module)
self.assertTrue(imported, "Problem importing '{}'".format(module))
def test_import_gui_draftlayer(self):
"""Import Draft Layer."""
module = "DraftLayer"
if not App.GuiUp:
aux._no_gui(module)
self.assertTrue(True)
return
imported = aux._import_test(module)
self.assertTrue(imported, "Problem importing '{}'".format(module))
def test_import_gui_draftplane(self):
"""Import Draft SelectPlane."""
module = "draftguitools.gui_selectplane"
if not App.GuiUp:
aux._no_gui(module)
self.assertTrue(True)
return
imported = aux._import_test(module)
self.assertTrue(imported, "Problem importing '{}'".format(module))
def test_import_gui_workingplane(self):
"""Import Draft WorkingPlane."""
module = "WorkingPlane"
if not App.GuiUp:
aux._no_gui(module)
self.assertTrue(True)
return
imported = aux._import_test(module)
self.assertTrue(imported, "Problem importing '{}'".format(module))

12
src/Mod/Draft/drafttests/test_pivy.py
View File

@@ -25,6 +25,7 @@
import unittest
import FreeCAD as App
import FreeCADGui as Gui
import drafttests.auxiliary as aux
from draftutils.messages import _msg
@@ -52,22 +53,11 @@ class DraftPivy(unittest.TestCase):
def test_pivy_import(self):
"""Import Coin (Pivy)."""
module = "pivy.coin"
if not App.GuiUp:
aux._no_gui(module)
self.assertTrue(True)
return
imported = aux._import_test(module)
self.assertTrue(imported, "Problem importing '{}'".format(module))
def test_pivy_draw(self):
"""Use Coin (pivy.coin) to draw a cube on the active view."""
module = "pivy.coin"
if not App.GuiUp:
aux._no_gui(module)
self.assertTrue(True)
return
import FreeCADGui as Gui
import pivy.coin as coin
cube = coin.SoCube()
_msg(" Draw cube")