X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FModelAPI%2FTest%2FTestDocument.py;h=90bcf24cf7aa67670e4c34d8f9863792288db8b1;hb=ee6034427d4adc3b83cad729e641537382576ab4;hp=fd9415488e1bf42ea70464cee20369dec3b205c1;hpb=f1a44c9b9859f584cbdae1ff50e79c0d9d34a24e;p=modules%2Fshaper.git

diff --git a/src/ModelAPI/Test/TestDocument.py b/src/ModelAPI/Test/TestDocument.py
index fd9415488..90bcf24cf 100644
--- a/src/ModelAPI/Test/TestDocument.py
+++ b/src/ModelAPI/Test/TestDocument.py
@@ -10,7 +10,7 @@ from ModelAPI import *
 # from GeomDataAPI import *
 # from GeomAlgoAPI import *
 
-__updated__ = "2014-12-16"
+__updated__ = "2014-12-26"
 
 #=========================================================================
 # Creation and activation of documents
@@ -18,7 +18,7 @@ __updated__ = "2014-12-16"
 aSession = ModelAPI_Session.get()
 # TODO: enable this assertion:
 assert(aSession.moduleDocument())
-assert(aSession.moduleDocument().id() == "root")
+assert(aSession.moduleDocument().id() == 0)
 assert(aSession.moduleDocument().kind() == "PartSet")
 assert(aSession.hasModuleDocument())
 # Create a new document
@@ -27,22 +27,22 @@ aSession.moduleDocument().addFeature("Part")
 aSession.finishOperation()
 
 assert(aSession.activeDocument())
-assert(aSession.activeDocument().id() == "Part_1")
+assert(aSession.activeDocument().id() == 1)
 assert(aSession.activeDocument().kind() == "Part")
 # Activate root doc
-aRootDoc = aSession.document("root")
+aRootDoc = aSession.document(0)
 assert(aRootDoc)
 aSession.startOperation()
 aSession.setActiveDocument(aRootDoc, False)
 aSession.finishOperation()
 assert(aSession.activeDocument())
-assert(aSession.activeDocument().id() == "root")
+assert(aSession.activeDocument().id() == 0)
 # check all opened docs
-for aDoc in aSession.allOpenedDocuments():
-    assert(aDoc)
+allDocsList = aSession.allOpenedDocuments()
+assert(len(allDocsList) != 0)
 # Activate Part_1 doc back for further testing
 aSession.startOperation()
-aSession.setActiveDocument(aSession.document("Part_1"), False)
+aSession.setActiveDocument(aSession.document(1), False)
 aSession.finishOperation()
 #=========================================================================
 # Duplication of a document
@@ -62,11 +62,11 @@ assert(aPart.size("Features") == 1)
 # Duplicate the document
 assert(aSession.moduleDocument().size("Parts") == 1)
 aSession.startOperation()
-aSession.moduleDocument().addFeature("Duplicate")
+aPart.addFeature("Duplicate")
 aSession.finishOperation()
 assert(aSession.moduleDocument().size("Parts") == 2)
 aCopyOfPart = aSession.activeDocument()
-assert(aCopyOfPart.id() == "Part_2")
+assert(aCopyOfPart.id() == 2)
 assert(aCopyOfPart.kind() == "Part")
 assert(aCopyOfPart.size("Features") == 1)
 assert(aCopyOfPart != aPart)
@@ -75,31 +75,19 @@ assert(aCopyOfPart != aPart)
 #=========================================================================
 assert(aSession.moduleDocument().size("Parts") == 2)
 aSession.startOperation()
-aSession.moduleDocument().addFeature("Remove")
+aPart.addFeature("Remove")
 aSession.finishOperation()
+# First part is deleted, but active is Part_2, so, it is still active
 assert(aSession.moduleDocument().size("Parts") == 1)
-assert(aSession.activeDocument().id() == aSession.moduleDocument().id())
+assert(aSession.activeDocument().id() == aCopyOfPart.id())
 # Remove another one document
 aSession.startOperation()
-aDoc1 = aSession.document("Part_1")
-aSession.setActiveDocument(aDoc1, False)
-aSession.moduleDocument().addFeature("Remove")
+aDoc2 = aSession.document(2)
+aSession.setActiveDocument(aDoc2, False)
+aDoc2.addFeature("Remove")
 aSession.finishOperation()
 assert(aSession.moduleDocument().size("Parts") == 0)
 assert(aSession.activeDocument())
-#=========================================================================
-# Trying to duplicate/remove the root
-#=========================================================================
-aSession.startOperation()
-aSession.moduleDocument().addFeature("Duplicate")
-aSession.finishOperation()
-assert(aSession.activeDocument().id() == aSession.moduleDocument().id())
-assert(aSession.moduleDocument().size("Parts") == 0)
-aSession.startOperation()
-aSession.moduleDocument().addFeature("Remove")
-aSession.finishOperation()
-assert(aSession.activeDocument().id() == aSession.moduleDocument().id())
-assert(aSession.moduleDocument().size("Parts") == 0)
-#=========================================================================
-# End of test
-#=========================================================================
+
+from salome.shaper import model
+assert(model.checkPythonDump())