[bos #26444] Fix tests

diff --git a/src/ParametersPlugin/CMakeLists.txt b/src/ParametersPlugin/CMakeLists.txt
index 4244e870b59aabb8c2dbcf3160db4ba190c7a745..bd37033bd251a2f6737fe6fcddb1df3125d13647 100644 (file)
--- a/src/ParametersPlugin/CMakeLists.txt
+++ b/src/ParametersPlugin/CMakeLists.txt
@@ -137,5 +137,5 @@ if(${HAVE_SALOME})
   endforeach(tfile ${TEST_NAMES})
   
   install(FILES ${TMP_TESTS_NAMES} DESTINATION ${TEST_INSTALL_DIRECTORY})
-  install(DIRECTORY data DESTINATION ${TEST_INSTALL_DIRECTORY})
+  install(DIRECTORY Test/data DESTINATION ${TEST_INSTALL_DIRECTORY})
 endif(${HAVE_SALOME})

diff --git a/src/ParametersPlugin/Test/TestImportInvalidParameters.py b/src/ParametersPlugin/Test/TestImportInvalidParameters.py
index 1eac0e9f7094e5ee6a84b5f1cfd862db0f9a3bc2..9faf17069f84bc2d6c402dfd92e1473d4b37e605 100644 (file)
--- a/src/ParametersPlugin/Test/TestImportInvalidParameters.py
+++ b/src/ParametersPlugin/Test/TestImportInvalidParameters.py
@@ -18,7 +18,7 @@
 #
 
 from salome.shaper import model
-import os, sys
+import inspect, os, sys
 
 from PyQt5.Qt import QApplication
 

diff --git a/src/ParametersPlugin/Test/TestImportParameters.py b/src/ParametersPlugin/Test/TestImportParameters.py
index a09a45202e8a5bc63fefd3d43dded988be6893f0..0a17a0f240b0098fb962fe591e55622a5e7fb22a 100644 (file)
--- a/src/ParametersPlugin/Test/TestImportParameters.py
+++ b/src/ParametersPlugin/Test/TestImportParameters.py
@@ -18,7 +18,7 @@
 #
 
 from salome.shaper import model
-import os
+import inspect, os
 
 from PyQt5.Qt import QApplication
 

diff --git a/src/ParametersPlugin/Test/data/invalid_parameters.txt b/src/ParametersPlugin/Test/data/invalid_parameters.txt
new file mode 100644 (file)
index 0000000..c119a86
--- /dev/null
+++ b/src/ParametersPlugin/Test/data/invalid_parameters.txt
@@ -0,0 +1,5 @@
+Hauteur  Longueur*Largeur
+
+Largeur3 #Comment
+# Comment
+ # Comm

diff --git a/src/ParametersPlugin/Test/data/parameters.txt b/src/ParametersPlugin/Test/data/parameters.txt
new file mode 100644 (file)
index 0000000..ca3185f
--- /dev/null
+++ b/src/ParametersPlugin/Test/data/parameters.txt
@@ -0,0 +1,5 @@
+Longueur  36. # "Longueur de la pièce"
+Largeur  24.  # Largeur de la pièce
+Hauteur  Longueur*Largeur
+A12  5. * 5.
+Longueur2 36. #\"Comment\" #Comm  #Comm
\ No newline at end of file

diff --git a/src/ParametersPlugin/data/invalid_parameters.txt b/src/ParametersPlugin/data/invalid_parameters.txt
deleted file mode 100644 (file)
index c119a86..0000000
--- a/src/ParametersPlugin/data/invalid_parameters.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Hauteur  Longueur*Largeur
-
-Largeur3 #Comment
-# Comment
- # Comm

diff --git a/src/ParametersPlugin/data/parameters.txt b/src/ParametersPlugin/data/parameters.txt
deleted file mode 100644 (file)
index ca3185f..0000000
--- a/src/ParametersPlugin/data/parameters.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Longueur  36. # "Longueur de la pièce"
-Largeur  24.  # Largeur de la pièce
-Hauteur  Longueur*Largeur
-A12  5. * 5.
-Longueur2 36. #\"Comment\" #Comm  #Comm
\ No newline at end of file