From 785e4b1ef03f6cedcdd163d292d7d43fbf3a9d2c Mon Sep 17 00:00:00 2001
From: Bernd Hahnebach <bernd@bimstatik.org>
Date: Sun, 19 Jan 2020 13:28:50 +0100
Subject: [PATCH] FEM: ccx unit tests, improve multiple material test name

---
 src/Mod/Fem/CMakeLists.txt                                    | 2 +-
 src/Mod/Fem/TestFem.py                                        | 4 ++--
 src/Mod/Fem/femtest/app/test_ccxtools.py                      | 4 ++--
 .../Fem/femtest/data/ccx/{multimat.inp => mat_multiple.inp}   | 0
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename src/Mod/Fem/femtest/data/ccx/{multimat.inp => mat_multiple.inp} (100%)

diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
index 0541c6b19f..e4116de386 100755
--- a/src/Mod/Fem/CMakeLists.txt
+++ b/src/Mod/Fem/CMakeLists.txt
@@ -176,8 +176,8 @@ SET(FemTestsCcx_SRCS
     femtest/data/ccx/cube_static_expected_values
     femtest/data/ccx/cube_static.FCStd
     femtest/data/ccx/cube.FCStd
+    femtest/data/ccx/mat_multiple.inp
     femtest/data/ccx/mat_nonlinear.inp
-    femtest/data/ccx/multimat.inp
     femtest/data/ccx/spine_thermomech.inp
     femtest/data/ccx/spine_thermomech.dat
     femtest/data/ccx/spine_thermomech.frd
diff --git a/src/Mod/Fem/TestFem.py b/src/Mod/Fem/TestFem.py
index aeb20a83db..36a2cb9453 100644
--- a/src/Mod/Fem/TestFem.py
+++ b/src/Mod/Fem/TestFem.py
@@ -124,7 +124,7 @@ gf()
 
 ./bin/FreeCADCmd --run-test "femtest.app.test_femimport.TestObjectExistance.test_objects_existance"
 ./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_1_static_analysis"
-./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_2_static_multiple_material"
+./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_2_static_material_multiple"
 ./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_3_static_material_nonlinar"
 ./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_4_freq_analysis"
 ./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_5_thermomech_analysis"
@@ -168,7 +168,7 @@ import unittest
 unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName("femtest.app.test_ccxtools.TestCcxTools.test_1_static_analysis"))
 
 import unittest
-unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName("femtest.app.test_ccxtools.TestCcxTools.test_2_static_multiple_material"))
+unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName("femtest.app.test_ccxtools.TestCcxTools.test_2_static_material_multiple"))
 
 import unittest
 unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName("femtest.app.test_ccxtools.TestCcxTools.test_3_static_material_nonlinar"))
diff --git a/src/Mod/Fem/femtest/app/test_ccxtools.py b/src/Mod/Fem/femtest/app/test_ccxtools.py
index 84d9074eb8..c16f3fc131 100644
--- a/src/Mod/Fem/femtest/app/test_ccxtools.py
+++ b/src/Mod/Fem/femtest/app/test_ccxtools.py
@@ -100,14 +100,14 @@ class TestCcxTools(unittest.TestCase):
         )
 
     # ********************************************************************************************
-    def test_2_static_multiple_material(
+    def test_2_static_material_multiple(
         self
     ):
         # set up
         from femexamples.material_multiple_twoboxes import setup
         setup(self.active_doc, "ccxtools")
         test_name = "multiple material"
-        base_name = "multimat"
+        base_name = "mat_multiple"
         analysis_dir = testtools.get_unit_test_tmp_dir(
             self.temp_dir,
             "FEM_ccx_multimat"
diff --git a/src/Mod/Fem/femtest/data/ccx/multimat.inp b/src/Mod/Fem/femtest/data/ccx/mat_multiple.inp
similarity index 100%
rename from src/Mod/Fem/femtest/data/ccx/multimat.inp
rename to src/Mod/Fem/femtest/data/ccx/mat_multiple.inp