From 6b08499c768dd88bd75b230d1460269f2e7bf6ad Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Tue, 11 Dec 2018 13:55:57 +0100 Subject: [PATCH] FEM: unit tests, rename test tools to utils to distinguish between test modules --- src/Mod/Fem/CMakeLists.txt | 2 +- src/Mod/Fem/femtest/testccxtools.py | 4 ++-- src/Mod/Fem/femtest/testcommon.py | 4 ++-- src/Mod/Fem/femtest/testmesh.py | 4 ++-- src/Mod/Fem/femtest/testobject.py | 4 ++-- src/Mod/Fem/femtest/testresult.py | 4 ++-- src/Mod/Fem/femtest/testsolverframework.py | 4 ++-- src/Mod/Fem/femtest/{testtools.py => utilstest.py} | 0 8 files changed, 13 insertions(+), 13 deletions(-) rename src/Mod/Fem/femtest/{testtools.py => utilstest.py} (100%) diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index a348ebaa9b..55d273f10b 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -121,7 +121,7 @@ SET(FemTests_SRCS femtest/testobject.py femtest/testresult.py femtest/testsolverframework.py - femtest/testtools.py + femtest/utilstest.py ) SET(FemTestsFiles_SRCS diff --git a/src/Mod/Fem/femtest/testccxtools.py b/src/Mod/Fem/femtest/testccxtools.py index 4c2964d88c..7c11d7bb8d 100644 --- a/src/Mod/Fem/femtest/testccxtools.py +++ b/src/Mod/Fem/femtest/testccxtools.py @@ -28,8 +28,8 @@ from femtools import ccxtools import FreeCAD import ObjectsFem import unittest -from . import testtools -from .testtools import fcc_print +from . import utilstest as testtools +from .utilstest import fcc_print class TestCcxTools(unittest.TestCase): diff --git a/src/Mod/Fem/femtest/testcommon.py b/src/Mod/Fem/femtest/testcommon.py index fa494734d4..a1b7de19dc 100644 --- a/src/Mod/Fem/femtest/testcommon.py +++ b/src/Mod/Fem/femtest/testcommon.py @@ -26,8 +26,8 @@ import FreeCAD import ObjectsFem import unittest -from . import testtools -from .testtools import fcc_print +from . import utilstest as testtools +from .utilstest import fcc_print class TestFemCommon(unittest.TestCase): diff --git a/src/Mod/Fem/femtest/testmesh.py b/src/Mod/Fem/femtest/testmesh.py index 93c784b134..c38fbb2649 100644 --- a/src/Mod/Fem/femtest/testmesh.py +++ b/src/Mod/Fem/femtest/testmesh.py @@ -26,8 +26,8 @@ import Fem import FreeCAD import unittest -from . import testtools -from .testtools import fcc_print +from . import utilstest as testtools +from .utilstest import fcc_print class TestMeshCommon(unittest.TestCase): diff --git a/src/Mod/Fem/femtest/testobject.py b/src/Mod/Fem/femtest/testobject.py index def71c6bdf..2deea4ccf8 100644 --- a/src/Mod/Fem/femtest/testobject.py +++ b/src/Mod/Fem/femtest/testobject.py @@ -26,8 +26,8 @@ import FreeCAD import ObjectsFem import unittest -from . import testtools -from .testtools import fcc_print +from . import utilstest as testtools +from .utilstest import fcc_print class TestObjectCreate(unittest.TestCase): diff --git a/src/Mod/Fem/femtest/testresult.py b/src/Mod/Fem/femtest/testresult.py index 677a93f0b3..5bdb5f792c 100644 --- a/src/Mod/Fem/femtest/testresult.py +++ b/src/Mod/Fem/femtest/testresult.py @@ -25,8 +25,8 @@ import FreeCAD import unittest -from . import testtools -from .testtools import fcc_print +from . import utilstest as testtools +from .utilstest import fcc_print class TestResult(unittest.TestCase): diff --git a/src/Mod/Fem/femtest/testsolverframework.py b/src/Mod/Fem/femtest/testsolverframework.py index 641eb7e361..2ca2048921 100644 --- a/src/Mod/Fem/femtest/testsolverframework.py +++ b/src/Mod/Fem/femtest/testsolverframework.py @@ -27,8 +27,8 @@ import FreeCAD import ObjectsFem import femsolver.run import unittest -from . import testtools -from .testtools import fcc_print +from . import utilstest as testtools +from .utilstest import fcc_print class TestSolverFrameWork(unittest.TestCase): diff --git a/src/Mod/Fem/femtest/testtools.py b/src/Mod/Fem/femtest/utilstest.py similarity index 100% rename from src/Mod/Fem/femtest/testtools.py rename to src/Mod/Fem/femtest/utilstest.py