From 347adfa9fda6823d691515c09a511ac047954f8f Mon Sep 17 00:00:00 2001
From: Bernd Hahnebach <bernd@bimstatik.org>
Date: Wed, 7 Feb 2018 13:32:53 +0100
Subject: [PATCH] FEM: unit tests, fix ccx result creation def

---
 src/Mod/Fem/femtest/testccxtools.py | 32 +++++++++++++++++++++--------
 src/Mod/Fem/femtest/testtools.py    | 14 ++-----------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/Mod/Fem/femtest/testccxtools.py b/src/Mod/Fem/femtest/testccxtools.py
index 176534fbc2..bdaf26404f 100644
--- a/src/Mod/Fem/femtest/testccxtools.py
+++ b/src/Mod/Fem/femtest/testccxtools.py
@@ -610,14 +610,28 @@ class FemCcxAnalysisTest(unittest.TestCase):
 
 
 def create_test_results():
-    print("run FEM unit tests")
-    runTestFem()
 
     import shutil
+    import os
     import FemGui
+    import femresult.resulttools as resulttools
+    from femtools import ccxtools
+
+    stat_types = ["U1", "U2", "U3", "Uabs", "Sabs", "MaxPrin", "MidPrin", "MinPrin", "MaxShear", "Peeq", "Temp", "MFlow", "NPress"]
+    temp_dir = testtools.get_fem_test_tmp_dir()
+    static_analysis_dir = temp_dir + 'FEM_ccx_static/'
+    frequency_analysis_dir = temp_dir + 'FEM_ccx_frequency/'
+    thermomech_analysis_dir = temp_dir + 'FEM_ccx_thermomech/'
+    Flow1D_thermomech_analysis_dir = temp_dir + 'FEM_ccx_Flow1D_thermomech/'
+
+    # run unit test from tests classes from this module
+    import Test
+    import sys
+    current_module = sys.modules[__name__]
+    Test.runTestsFromModule(current_module)
 
     # static and frequency cube
-    FreeCAD.open(static_save_fc_file)
+    FreeCAD.open(static_analysis_dir + 'cube_static.fcstd')
     FemGui.setActiveAnalysis(FreeCAD.ActiveDocument.Analysis)
     fea = ccxtools.FemToolsCcx()
 
@@ -661,8 +675,9 @@ def create_test_results():
     shutil.copyfile(frd_result_file, frd_frequency_test_result_file)
     shutil.copyfile(dat_result_file, dat_frequency_test_result_file)
 
+    # thermomech
     print("create thermomech result files")
-    FreeCAD.open(thermomech_save_fc_file)
+    FreeCAD.open(thermomech_analysis_dir + 'spine_thermomech.fcstd')
     FemGui.setActiveAnalysis(FreeCAD.ActiveDocument.Analysis)
     fea = ccxtools.FemToolsCcx()
     fea.reset_all()
@@ -685,8 +700,9 @@ def create_test_results():
     shutil.copyfile(dat_result_file, dat_thermomech_test_result_file)
     print('Results copied to the appropriate FEM test dirs in: ' + temp_dir)
 
+    # Flow1D
     print("create Flow1D result files")
-    FreeCAD.open(Flow1D_thermomech_save_fc_file)
+    FreeCAD.open(Flow1D_thermomech_analysis_dir + 'Flow1D_thermomech.fcstd')
     FemGui.setActiveAnalysis(FreeCAD.ActiveDocument.Analysis)
     fea = ccxtools.FemToolsCcx()
     fea.reset_all()
@@ -711,10 +727,10 @@ def create_test_results():
 
 
 '''
-update the results of FEM unit tests:
+update the results of FEM ccxtools unit tests:
 
-import femtest.testfemcommon
-femtest.testfemcommon.create_test_results()
+from femtest.testccxtools import create_test_results
+create_test_results()
 
 copy result files from your_temp_directory/FEM_unittests/   test directories into the src directory
 compare the results with git difftool
diff --git a/src/Mod/Fem/femtest/testtools.py b/src/Mod/Fem/femtest/testtools.py
index f4de4c055a..a55ed0ecbf 100644
--- a/src/Mod/Fem/femtest/testtools.py
+++ b/src/Mod/Fem/femtest/testtools.py
@@ -27,8 +27,6 @@ __author__ = "Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
 
-from femtools import ccxtools
-import femresult.resulttools as resulttools
 import FreeCAD
 import tempfile
 import os
@@ -117,6 +115,8 @@ def compare_files(file_name1, file_name2):
 
 
 def compare_stats(fea, stat_file=None, loc_stat_types=None, res_obj_name=None):
+    import femresult.resulttools as resulttools
+    stat_types = ["U1", "U2", "U3", "Uabs", "Sabs", "MaxPrin", "MidPrin", "MinPrin", "MaxShear", "Peeq", "Temp", "MFlow", "NPress"]
     if not loc_stat_types:
         loc_stat_types = stat_types
     if stat_file:
@@ -170,16 +170,6 @@ def collect_python_modules(femsubdir=None):
     return collected_modules
 
 
-def runTestFem():
-    '''run FEM unit test
-    for more information on how to run a specific test class or a test def see comment at file end
-    '''
-    import Test
-    import sys
-    current_module = sys.modules[__name__]
-    Test.runTestsFromModule(current_module)
-
-
 '''
 for more information on how to run a specific test class or a test def see
 file src/Mod/Test/__init__