From 404b42d0a6059faa668c72255d80b7a6932c56ce Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 28 Aug 2018 19:39:34 +0200 Subject: [PATCH] unit tests of Arch and Draft require GUI, improve output of units tests --- src/Mod/Arch/Init.py | 2 -- src/Mod/Arch/InitGui.py | 2 ++ src/Mod/Draft/Init.py | 2 -- src/Mod/Draft/InitGui.py | 2 ++ src/Mod/Test/UnitTests.py | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Mod/Arch/Init.py b/src/Mod/Arch/Init.py index 7da766e315..10fc0bd968 100644 --- a/src/Mod/Arch/Init.py +++ b/src/Mod/Arch/Init.py @@ -32,5 +32,3 @@ FreeCAD.addImportType("Collada (*.dae)","importDAE") FreeCAD.addExportType("Collada (*.dae)","importDAE") FreeCAD.addImportType("3D Studio mesh (*.3ds)","import3DS") FreeCAD.addImportType("SweetHome3D XML export (*.zip)","importSH3D") - -FreeCAD.__unit_test__ += [ "TestArch" ] diff --git a/src/Mod/Arch/InitGui.py b/src/Mod/Arch/InitGui.py index 53753273a9..86ba5c8232 100644 --- a/src/Mod/Arch/InitGui.py +++ b/src/Mod/Arch/InitGui.py @@ -137,4 +137,6 @@ import Arch_rc FreeCADGui.addPreferencePage(":/ui/preferences-ifc.ui","Import-Export") FreeCADGui.addPreferencePage(":/ui/preferences-dae.ui","Import-Export") +FreeCAD.__unit_test__ += [ "TestArch" ] + diff --git a/src/Mod/Draft/Init.py b/src/Mod/Draft/Init.py index 79caef3bad..f3415a091d 100644 --- a/src/Mod/Draft/Init.py +++ b/src/Mod/Draft/Init.py @@ -30,5 +30,3 @@ App.addExportType("Flattened SVG (*.svg)","importSVG") App.addExportType("Open CAD Format (*.oca)","importOCA") App.addImportType("Autodesk DWG 2D (*.dwg)","importDWG") App.addExportType("Autodesk DWG 2D (*.dwg)","importDWG") - -FreeCAD.__unit_test__ += [ "TestDraft" ] diff --git a/src/Mod/Draft/InitGui.py b/src/Mod/Draft/InitGui.py index 6b29a028be..d8606b9a5b 100644 --- a/src/Mod/Draft/InitGui.py +++ b/src/Mod/Draft/InitGui.py @@ -145,3 +145,5 @@ FreeCADGui.addPreferencePage(":/ui/preferences-dxf.ui","Import-Export") FreeCADGui.addPreferencePage(":/ui/preferences-dwg.ui","Import-Export") FreeCADGui.addPreferencePage(":/ui/preferences-svg.ui","Import-Export") FreeCADGui.addPreferencePage(":/ui/preferences-oca.ui","Import-Export") + +FreeCAD.__unit_test__ += [ "TestDraft" ] diff --git a/src/Mod/Test/UnitTests.py b/src/Mod/Test/UnitTests.py index 4ed4a4bea1..eddb3af665 100644 --- a/src/Mod/Test/UnitTests.py +++ b/src/Mod/Test/UnitTests.py @@ -74,13 +74,13 @@ class UnitBasicCases(unittest.TestCase): for i in range(num): t = FreeCAD.Units.schemaTranslate(psi, i) v = FreeCAD.Units.parseQuantity(t[0]).getValueAs("psi") - self.assertAlmostEqual(1, v.Value, msg="Failed with \"{0}\" scheme: {1} != 1".format(schemes[i], v.Value), delta=self.delta) + self.assertAlmostEqual(1, v.Value, msg="Failed with \"{0}\" scheme: {1} != 1 (delta: {2})".format(schemes[i], v.Value, self.delta), delta=self.delta) ksi = FreeCAD.Units.parseQuantity("1ksi") for i in range(num): t = FreeCAD.Units.schemaTranslate(ksi, i) v = FreeCAD.Units.parseQuantity(t[0]).getValueAs("ksi") - self.assertAlmostEqual(1, v.Value, msg="Failed with \"{0}\" scheme: {1} != 1".format(schemes[i], v.Value), delta=self.delta) + self.assertAlmostEqual(1, v.Value, msg="Failed with \"{0}\" scheme: {1} != 1 (delta: {2})".format(schemes[i], v.Value, self.delta), delta=self.delta) def testTrigonometric(self): #tu=FreeCAD.Units.translateUnit