From 14c36da81d9d53052a248c3a02d1e7d7854e78fb Mon Sep 17 00:00:00 2001 From: Przemo Firszt Date: Fri, 24 Jul 2015 11:19:01 +0100 Subject: [PATCH] Test: Fix formatting in TestApp.py Signed-off-by: Przemo Firszt --- src/Mod/Test/TestApp.py | 60 ++++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/src/Mod/Test/TestApp.py b/src/Mod/Test/TestApp.py index d77682b61..9ee92b6b4 100644 --- a/src/Mod/Test/TestApp.py +++ b/src/Mod/Test/TestApp.py @@ -1,5 +1,5 @@ #*************************************************************************** -#* (c) Juergen Riegel (juergen.riegel@web.de) 2002 * +#* (c) Juergen Riegel (juergen.riegel@web.de) 2002 * #* * #* This file is part of the FreeCAD CAx development system. * #* * @@ -10,21 +10,23 @@ #* 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 * +#* 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 * +#* License along with FreeCAD; if not, write to the Free Software * #* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * #* USA * #* * #* Juergen Riegel 2002 * #***************************************************************************/ -import FreeCAD, os, unittest, sys +import FreeCAD +import sys +import unittest + - #--------------------------------------------------------------------------- # define the functions to test the FreeCAD base code #--------------------------------------------------------------------------- @@ -33,47 +35,49 @@ import FreeCAD, os, unittest, sys def All(): suite = unittest.TestSuite() # Base system tests - suite.addTest(unittest.defaultTestLoader.loadTestsFromName("UnicodeTests") ) - suite.addTest(unittest.defaultTestLoader.loadTestsFromName("Document") ) - suite.addTest(unittest.defaultTestLoader.loadTestsFromName("UnitTests") ) - suite.addTest(unittest.defaultTestLoader.loadTestsFromName("BaseTests") ) + suite.addTest(unittest.defaultTestLoader.loadTestsFromName("UnicodeTests")) + suite.addTest(unittest.defaultTestLoader.loadTestsFromName("Document")) + suite.addTest(unittest.defaultTestLoader.loadTestsFromName("UnitTests")) + suite.addTest(unittest.defaultTestLoader.loadTestsFromName("BaseTests")) # Base system gui test - if ( FreeCAD.GuiUp == 1): - suite.addTest(unittest.defaultTestLoader.loadTestsFromName("Workbench") ) - suite.addTest(unittest.defaultTestLoader.loadTestsFromName("Menu") ) + if (FreeCAD.GuiUp == 1): + suite.addTest(unittest.defaultTestLoader.loadTestsFromName("Workbench")) + suite.addTest(unittest.defaultTestLoader.loadTestsFromName("Menu")) # add the module tests - suite.addTest(unittest.defaultTestLoader.loadTestsFromName("MeshTestsApp") ) - suite.addTest(unittest.defaultTestLoader.loadTestsFromName("TestSketcherApp") ) - suite.addTest(unittest.defaultTestLoader.loadTestsFromName("TestPartApp") ) - suite.addTest(unittest.defaultTestLoader.loadTestsFromName("TestPartDesignApp") ) + suite.addTest(unittest.defaultTestLoader.loadTestsFromName("TestFem")) + suite.addTest(unittest.defaultTestLoader.loadTestsFromName("MeshTestsApp")) + suite.addTest(unittest.defaultTestLoader.loadTestsFromName("TestSketcherApp")) + suite.addTest(unittest.defaultTestLoader.loadTestsFromName("TestPartApp")) + suite.addTest(unittest.defaultTestLoader.loadTestsFromName("TestPartDesignApp")) # gui tests of modules - if ( FreeCAD.GuiUp == 1): - suite.addTest(unittest.defaultTestLoader.loadTestsFromName("TestSketcherGui") ) - suite.addTest(unittest.defaultTestLoader.loadTestsFromName("TestPartGui") ) - suite.addTest(unittest.defaultTestLoader.loadTestsFromName("TestPartDesignGui") ) - suite.addTest(unittest.defaultTestLoader.loadTestsFromName("TestDraft") ) - suite.addTest(unittest.defaultTestLoader.loadTestsFromName("TestArch") ) + if (FreeCAD.GuiUp == 1): + suite.addTest(unittest.defaultTestLoader.loadTestsFromName("TestSketcherGui")) + suite.addTest(unittest.defaultTestLoader.loadTestsFromName("TestPartGui")) + suite.addTest(unittest.defaultTestLoader.loadTestsFromName("TestPartDesignGui")) + suite.addTest(unittest.defaultTestLoader.loadTestsFromName("TestDraft")) + suite.addTest(unittest.defaultTestLoader.loadTestsFromName("TestArch")) return suite - + def TestText(s): s = unittest.defaultTestLoader.loadTestsFromName(s) - r = unittest.TextTestRunner(stream=sys.stdout,verbosity=2) + r = unittest.TextTestRunner(stream=sys.stdout, verbosity=2) r.run(s) + def Test(s): TestText(s) + def testAll(): TestText(All()) + def testUnit(): TestText(unittest.TestLoader().loadTestsFromName('UnitTests')) + def testDocument(): suite = unittest.TestSuite() - suite.addTest(unittest.defaultTestLoader.loadTestsFromName("Document") ) + suite.addTest(unittest.defaultTestLoader.loadTestsFromName("Document")) TestText(suite) - - -