From: mpv Date: Mon, 26 Nov 2018 10:58:51 +0000 (+0300) Subject: For for the the problem of lower/upper case in the test name (reproduced on Linux). X-Git-Tag: End2018~150 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e783274518ed17ac6350a3d5643f9931f12b15b1;p=modules%2Fshaper.git For for the the problem of lower/upper case in the test name (reproduced on Linux). --- diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt index f20dcaf7a..3f6299fd7 100644 --- a/src/FeaturesPlugin/CMakeLists.txt +++ b/src/FeaturesPlugin/CMakeLists.txt @@ -343,9 +343,9 @@ ADD_UNIT_TESTS(TestExtrusion.py Test2592.py Test2588.py Test1467.py - TestPartitionSubCompsolidWithCompsolid1.py - TestPartitionSubCompsolidWithCompsolid2.py - TestPartitionSubCompsolidWithCompsolid3.py + TestPartitionSubCompsolidWithCompSolid1.py + TestPartitionSubCompsolidWithCompSolid2.py + TestPartitionSubCompsolidWithCompSolid3.py TestPartitionSubCompsolidWithSolid1.py TestPartitionSubCompsolidWithSolid2.py TestPartitionSubCompsolidWithSolid3.py diff --git a/src/Model/Model_AttributeSelection.cpp b/src/Model/Model_AttributeSelection.cpp index 3d97c91c9..58ba6921b 100644 --- a/src/Model/Model_AttributeSelection.cpp +++ b/src/Model/Model_AttributeSelection.cpp @@ -781,7 +781,7 @@ std::string Model_AttributeSelection::namingName(const std::string& theDefaultNa Selector_Selector aSelector(aSelLab, baseDocumentLab()); std::string aResult; - if (aSelector.restore(aCont->shape()->impl())) + if (aCont->shape().get() && aSelector.restore(aCont->shape()->impl())) aResult = aSelector.name(this); if (aCenterType != NOT_CENTER) { aResult += centersMap()[aCenterType];