Make unit tests work with the new validator checking

diff --git a/src/BuildPlugin/Test/TestFace.py b/src/BuildPlugin/Test/TestFace.py
index 47091eeb78da7423608842dac9987239310ea93a..4ad935ab0320f54d539af26725f8cf31b8bbb50a 100644 (file)
--- a/src/BuildPlugin/Test/TestFace.py
+++ b/src/BuildPlugin/Test/TestFace.py
@@ -113,11 +113,21 @@ assert (len(aFaceFeature2.results()) > 0)
 # =============================================================================
 # Test 3. Create face from face of solid
 # =============================================================================
+aSession.startOperation()
+aCylinder = aPart.addFeature("Cylinder")
+aCylinder.string("CreationMethod").setValue("Cylinder")
+aCylinder.selection("base_point").selectSubShape("VERTEX", "PartSet/Origin")
+aCylinder.selection("axis").selectSubShape("EDGE", "PartSet/OZ")
+aCylinder.real("radius").setValue(5)
+aCylinder.real("height").setValue(10)
+aSession.finishOperation()
+aCylinderResult = aCylinder.firstResult()
+aCylinderShape = aCylinderResult.shape()
 
 aSession.startOperation()
 aFaceFeature3 = aPart.addFeature("Face")
 aBaseObjectsList = aFaceFeature3.selectionList("base_objects")
-aBaseObjectsList.append("Cylinder_1_1/Face_1", "FACE")
+aBaseObjectsList.append("Cylinder_2_1/Face_1", "FACE")
 aSession.finishOperation()
 assert (len(aFaceFeature3.results()) > 0)
 
@@ -125,6 +135,17 @@ assert (len(aFaceFeature3.results()) > 0)
 # Test 4. Verify error is reported if selection of face feature is mixed (edges and face)
 # =============================================================================
 
+aSession.startOperation()
+aCylinder = aPart.addFeature("Cylinder")
+aCylinder.string("CreationMethod").setValue("Cylinder")
+aCylinder.selection("base_point").selectSubShape("VERTEX", "PartSet/Origin")
+aCylinder.selection("axis").selectSubShape("EDGE", "PartSet/OZ")
+aCylinder.real("radius").setValue(5)
+aCylinder.real("height").setValue(10)
+aSession.finishOperation()
+aCylinderResult = aCylinder.firstResult()
+aCylinderShape = aCylinderResult.shape()
+
 aSession.startOperation()
 aFaceFeature4 = aPart.addFeature("Face")
 aBaseObjectsList = aFaceFeature4.selectionList("base_objects")
@@ -132,7 +153,7 @@ aShapeExplorer = GeomAPI_ShapeExplorer(aSketchShape, GeomAPI_Shape.EDGE)
 while aShapeExplorer.more():
     aBaseObjectsList.append(aSketchResult, aShapeExplorer.current())
     aShapeExplorer.next()
-aBaseObjectsList.append("Cylinder_1_1/Face_3", "FACE")
+aBaseObjectsList.append("Cylinder_3_1/Face_3", "FACE")
 aSession.finishOperation()
 assert (len(aFaceFeature4.results()) == 0)
 # remove failed feature

diff --git a/src/Model/Model_AttributeValidator.cpp b/src/Model/Model_AttributeValidator.cpp
index 659082b054c8221a26838c7e1431bdae28c12ec1..ab01428148b1f47f90fab019e49e2182233914a0 100644 (file)
--- a/src/Model/Model_AttributeValidator.cpp
+++ b/src/Model/Model_AttributeValidator.cpp
@@ -123,8 +123,7 @@ bool Model_AttributeValidator::isValid(const AttributePtr& theAttribute,
                 aCheckFeature = false;
               } else {
                 aRefd = *aRefRes;
-                if (aRefd->groupName() != ModelAPI_ResultBody::group() &&
-                    aRefd->groupName() != ModelAPI_ResultPart::group())
+                if (aRefd->groupName() != ModelAPI_ResultBody::group())
                   break;
               }
               if (!aRefd->data().get() || !aRefd->data()->isValid())