Fix unit tests for the Folder feature

diff --git a/src/ModelAPI/Test/TestFolder_Update.py b/src/ModelAPI/Test/TestFolder_Update.py
index c16eb03c380c5662d2522f85ca694832978c91ca..39406251df079dbd2b17e96f8e702cd718cda08d 100644 (file)
--- a/src/ModelAPI/Test/TestFolder_Update.py
+++ b/src/ModelAPI/Test/TestFolder_Update.py
@@ -60,7 +60,7 @@ NB_FEATURES_FULL = 2
 NB_FEATURES_OUT  = 2
 
 assert(aPartDoc.size("Folders") == 1), "Wrong number of folders: {}".format(aPartDoc.size("Folders"))
-assert(aPartDoc.size("Features") == 2), "Wrong number of features: {}".format(aPartDoc.size("Features"))
+assert(aPartDoc.size("Features") == NB_FEATURES_FULL), "Wrong number of features: {}".format(aPartDoc.size("Features"))
 FOLDER_NAME_EXPECTED = "Folder_1"
 assert(aFolder1.name() == FOLDER_NAME_EXPECTED), "Actual name '{}', expected '{}'".format(aFolder1.name(), FOLDER_NAME_EXPECTED)
 
@@ -86,17 +86,34 @@ assert(aFound[0].data().isEqual(aFolder1.data()))
 assert(aFound[1] == 0)
 
 #=========================================================================
-# Test 2. Add a point into a folder below
+# Test 2. Add a point, check it is added to a folder, then move it out
 #=========================================================================
 aPoint2 = newPoint(aPartDoc, 10., 0., 0.)
-aPoint3 = newPoint(aPartDoc, 10., 10., 0.)
 
-NB_FEATURES_FULL += 2
-NB_FEATURES_OUT += 2
+NB_FEATURES_FULL += 1
+assert(aPartDoc.size("Features") == NB_FEATURES_FULL), "Wrong number of features: {}, expected: {}".format(aPartDoc.size("Features"), NB_FEATURES_FULL)
+assert(aPartDoc.size("Features", True) == NB_FEATURES_OUT), "Wrong number of features outside a folder: {}, expected: {}".format(aPartDoc.size("Features", True), NB_FEATURES_OUT)
+
+fromFolder = FeatureList()
+fromFolder.append(aPoint2)
+
+aSession.startOperation()
+isMovedOut = aPartDoc.removeFromFolder(fromFolder)
+aSession.finishOperation()
+assert(isMovedOut)
 
+NB_FEATURES_OUT += 1
 assert(aPartDoc.size("Features") == NB_FEATURES_FULL), "Wrong number of features: {}, expected: {}".format(aPartDoc.size("Features"), NB_FEATURES_FULL)
 assert(aPartDoc.size("Features", True) == NB_FEATURES_OUT), "Wrong number of features outside a folder: {}, expected: {}".format(aPartDoc.size("Features", True), NB_FEATURES_OUT)
 
+#=========================================================================
+# Test 3. Add a point into a folder below
+#=========================================================================
+aPoint3 = newPoint(aPartDoc, 10., 10., 0.)
+
+NB_FEATURES_FULL += 1
+NB_FEATURES_OUT += 1
+
 # add a folder
 aSession.startOperation()
 aFolder2 = aPartDoc.addFolder(aPoint3)
@@ -133,7 +150,7 @@ aFound = aPartDoc.findContainingFolder(aPoint3)
 assert(aFound == -1)
 
 #=========================================================================
-# Test 3. Add several points into a folder
+# Test 4. Add several points into a folder
 #=========================================================================
 aPoint4 = newPoint(aPartDoc, 0., 10., 0.)
 
@@ -201,9 +218,16 @@ aFound = aPartDoc.findContainingFolder(aPoint4)
 assert(aFound[0].data().isEqual(aFolder3.data()))
 assert(aFound[1] == 1)
 
+aPoint5 = newPoint(aPartDoc, 0., 0., 10.)
+fromFolder = FeatureList()
+fromFolder.append(aPoint5)
+
+aSession.startOperation()
+isMovedOut = aPartDoc.removeFromFolder(fromFolder)
+aSession.finishOperation()
+assert(isMovedOut)
 
 # add more points to the folder to move them out
-aPoint5 = newPoint(aPartDoc, 0., 0., 10.)
 aPoint6 = newPoint(aPartDoc, 10., 0., 10.)
 aPoint7 = newPoint(aPartDoc, 10., 10., 10.)
 aPoint8 = newPoint(aPartDoc, 0., 10., 10.)
@@ -235,7 +259,7 @@ assert(aFolder3.reference("first_feature").value() is not None)
 assert(aFolder3.reference("last_feature").value() is not None)
 
 #=========================================================================
-# Test 4. Remove a point from a folder before it
+# Test 5. Remove a point from a folder before it
 #=========================================================================
 fromFolder = FeatureList()
 fromFolder.append(aPoint3)
@@ -256,7 +280,7 @@ assert(aFolder3.reference("first_feature").value() is not None)
 assert(aFolder3.reference("last_feature").value() is not None)
 
 #=========================================================================
-# Test 5. Remove a point from a folder after it
+# Test 6. Remove a point from a folder after it
 #=========================================================================
 fromFolder = FeatureList()
 fromFolder.append(aPoint8)
@@ -277,7 +301,7 @@ assert(aFolder3.reference("first_feature").value() is not None)
 assert(aFolder3.reference("last_feature").value() is not None)
 
 #=========================================================================
-# Test 6. Try to remove several points which are not start nor end in a folder
+# Test 7. Try to remove several points which are not start nor end in a folder
 #=========================================================================
 fromFolder = FeatureList()
 fromFolder.append(aPoint5)
@@ -300,7 +324,7 @@ assert(aFolder3.reference("first_feature").value() is not None)
 assert(aFolder3.reference("last_feature").value() is not None)
 
 #=========================================================================
-# Test 7. Remove several points from a folder after it
+# Test 8. Remove several points from a folder after it
 #=========================================================================
 fromFolder = FeatureList()
 fromFolder.append(aPoint6)
@@ -324,7 +348,7 @@ assert(aFolder3.reference("first_feature").value() is not None)
 assert(aFolder3.reference("last_feature").value() is not None)
 
 #=========================================================================
-# Test 8. Remove all remaining points from a folder after it
+# Test 9. Remove all remaining points from a folder after it
 #=========================================================================
 fromFolder = FeatureList()
 fromFolder.append(aPoint4)
@@ -349,7 +373,10 @@ assert(aPartDoc.index(aPoint8, True) == 8), "Wrong index of the point: {}".forma
 # folder is empty
 assert(aFolder3.reference("first_feature").value() is None)
 assert(aFolder3.reference("last_feature").value() is None)
-
+# remove empty folder
+aSession.startOperation()
+aPartDoc.removeFolder(aFolder3)
+aSession.finishOperation()
 
 from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/ModelHighAPI/ModelHighAPI_Dumper.cpp b/src/ModelHighAPI/ModelHighAPI_Dumper.cpp
index 4ac4db53a15e30db5c587c65e6fcc90145b84eb7..20e8ff20f36c221f489705c00c7b8ca20b1eb388 100644 (file)
--- a/src/ModelHighAPI/ModelHighAPI_Dumper.cpp
+++ b/src/ModelHighAPI/ModelHighAPI_Dumper.cpp
@@ -281,6 +281,8 @@ bool ModelHighAPI_Dumper::process(const std::shared_ptr<ModelAPI_Document>& theD
       }
     }
   }
+  // dump folders if any
+  dumpPostponed(true);
   return isOk;
 }
 
@@ -327,6 +329,8 @@ bool ModelHighAPI_Dumper::process(const std::shared_ptr<ModelAPI_CompositeFeatur
   // decrease composite features stack
   --gCompositeStackDepth;
 
+  // dump folders if any
+  dumpPostponed(true);
   return isOk;
 }
 
@@ -366,7 +370,7 @@ bool ModelHighAPI_Dumper::processSubs(
   if (isDumpSetName)
     dumpEntitySetName();
   // dump folders if any
-  dumpPostponed();
+  dumpPostponed(true);
   return isOk;
 }
 
@@ -377,7 +381,7 @@ void ModelHighAPI_Dumper::postpone(const EntityPtr& theEntity)
   myPostponed.push_back(theEntity);
 }
 
-void ModelHighAPI_Dumper::dumpPostponed()
+void ModelHighAPI_Dumper::dumpPostponed(bool theDumpFolders)
 {
   if (myDumpPostponedInProgress)
     return;
@@ -392,8 +396,12 @@ void ModelHighAPI_Dumper::dumpPostponed()
   std::list<EntityPtr>::const_iterator anIt = aPostponedCopy.begin();
   for (; anIt != aPostponedCopy.end(); ++anIt) {
     FolderPtr aFolder = std::dynamic_pointer_cast<ModelAPI_Folder>(*anIt);
-    if (aFolder)
-      dumpFolder(aFolder);
+    if (aFolder) {
+      if (theDumpFolders)
+        dumpFolder(aFolder);
+      else
+        myPostponed.push_back(*anIt);
+    }
     else {
       FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(*anIt);
       if (aFeature)

diff --git a/src/ModelHighAPI/ModelHighAPI_Dumper.h b/src/ModelHighAPI/ModelHighAPI_Dumper.h
index b287dd6ec3eb3d71748b88208e7925cdf04b5174..c034cf3011e4635ac44b2abe54ce1cac3892c2af 100644 (file)
--- a/src/ModelHighAPI/ModelHighAPI_Dumper.h
+++ b/src/ModelHighAPI/ModelHighAPI_Dumper.h
@@ -302,7 +302,7 @@ private:
   bool isDefaultTransparency(const ResultPtr& theResult) const;
 
   /// Dump postponed entities
-  void dumpPostponed();
+  void dumpPostponed(bool theDumpFolders = false);
 
 private:
   struct EntityName {

diff --git a/src/ModelHighAPI/ModelHighAPI_Folder.cpp b/src/ModelHighAPI/ModelHighAPI_Folder.cpp
index 16c3b6dc4d7789c0c8e525db489e46fd6287d556..ef62474ed0d3782b5e4072896f5027f457162fcb 100644 (file)
--- a/src/ModelHighAPI/ModelHighAPI_Folder.cpp
+++ b/src/ModelHighAPI/ModelHighAPI_Folder.cpp
@@ -66,11 +66,13 @@ void ModelHighAPI_Folder::dump(ModelHighAPI_Dumper& theDumper) const
   AttributeReferencePtr aStartRef = myFolder->reference(ModelAPI_Folder::FIRST_FEATURE_ID());
   AttributeReferencePtr aEndRef   = myFolder->reference(ModelAPI_Folder::LAST_FEATURE_ID());
 
-  // Dump folder if it is empty or when its features have been already dumped.
-  // Otherwise, store the folder postponed.
+  // do not dump empty folders
   if (!aEndRef->value())
-    theDumper << myFolder << " = model.addFolder(" << aDocName << ")" << std::endl;
-  else if (theDumper.isDumped(EntityPtr(aEndRef->value())))
+    return;
+
+  // Dump folder when its features have been already dumped.
+  // Otherwise, store the folder postponed.
+  if (theDumper.isDumped(EntityPtr(aEndRef->value())))
     theDumper << myFolder << " = model.addFolder(" << aDocName << ", "
               << aStartRef << ", " << aEndRef << ")" << std::endl;
   else