kindred/create
1
1
Fork 0
Code Issues 37 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 5147ffd496
commit 26864d9633
7 changed files with 119 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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")