Added methods that weren't tested

diff --git a/src/SALOMEDS/Test/SALOMEDSTest_AttributeTreeNode.cxx b/src/SALOMEDS/Test/SALOMEDSTest_AttributeTreeNode.cxx
index 309035de79344f387ffd6bfa78d6cd40d648e869..084d531a0701f931e01cef5a899043dd994ee189 100755 (executable)
--- a/src/SALOMEDS/Test/SALOMEDSTest_AttributeTreeNode.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest_AttributeTreeNode.cxx
@@ -59,6 +59,9 @@ void SALOMEDSTest::testAttributeTreeNode()
   //Check the attribute creation
   CPPUNIT_ASSERT(_attr1);
 
+  //Check method Label
+  CPPUNIT_ASSERT(_attr1->Label() == "0:1:2");
+
   _PTR(SObject) so2 = study->CreateObjectID("0:1:3");
 
   _PTR(AttributeTreeNode) _attr2 = studyBuilder->FindOrCreateAttribute(so2, "AttributeTreeNode");
@@ -74,7 +77,7 @@ void SALOMEDSTest::testAttributeTreeNode()
 
 #ifdef SALOMEDS_ALL_TESTS
   //Check method GetFather
-  CPPUNIT_ASSERT(_attr1->GetFather() == _attr);
+  CPPUNIT_ASSERT(_attr1->GetFather()->Label() == _attr->Label());
 
   //Check method Append
   _attr->Append(_attr1);
@@ -85,15 +88,16 @@ void SALOMEDSTest::testAttributeTreeNode()
   CPPUNIT_ASSERT(_attr1->HasNext());
 
   //Check method GetNext
-  CPPUNIT_ASSERT(_attr1->GetNext() == _attr2);
+  CPPUNIT_ASSERT(_attr1->GetNext()->Label() == _attr2->Label());
 
-  //Check method GetPrevious
-  CPPUNIT_ASSERT(_attr2->GetPrevious());
+  //Check method HasPrevious
+  CPPUNIT_ASSERT(_attr2->HasPrevious());
 
-  CPPUNIT_ASSERT(_attr2->GetPrevious() == _attr1);
+  //Check method GetPrevious
+  CPPUNIT_ASSERT(_attr2->GetPrevious()->Label() == _attr1->Label());
 
   //Check method Depth
-  CPPUNIT_ASSERT(_attr->Depth() == 2);
+  CPPUNIT_ASSERT(_attr->Depth() == 0 && _attr1->Depth() == 1);
 
   //Check method IsRoot
   CPPUNIT_ASSERT(_attr->IsRoot());
@@ -105,38 +109,41 @@ void SALOMEDSTest::testAttributeTreeNode()
   CPPUNIT_ASSERT(_attr2->IsDescendant(_attr));
 
   //Check method GetFirst
-  CPPUNIT_ASSERT(_attr->GetFirst() == _attr1);
+  CPPUNIT_ASSERT(_attr->GetFirst()->Label() == _attr1->Label());
+
+  _attr2->Remove();
 
   //Check method Prepend
   _attr->Prepend(_attr2);
 
-  CPPUNIT_ASSERT(_attr->GetFirst() == _attr2);
+  CPPUNIT_ASSERT(_attr->GetFirst()->Label() == _attr2->Label());
+
+  _attr1->Remove();
 
   //Check method InsertBefore
   _attr2->InsertBefore(_attr1);
 
-  CPPUNIT_ASSERT(_attr->GetFirst() == _attr1);
+  CPPUNIT_ASSERT(_attr->GetFirst()->Label() == _attr1->Label());
+
+  _attr1->Remove();
 
   //Check method InsertAfter
   _attr2->InsertAfter(_attr1);
 
-  CPPUNIT_ASSERT(_attr->GetFirst() == _attr2);
-
-  //Check method Label
-  CPPUNIT_ASSERT(_attr1->Label() == "0:1:2");
+  CPPUNIT_ASSERT(_attr->GetFirst()->Label() == _attr2->Label());
 
   //Check method Remove
   _attr2->Remove();
 
-  CPPUNIT_ASSERT(_attr->GetFirst() == _attr1);
+  CPPUNIT_ASSERT(_attr->GetFirst()->Label() == _attr1->Label());
 
   //Check method SetTreeID and GetTreeID
   _attr2->SetTreeID(TreeNodeID);
 
   CPPUNIT_ASSERT(_attr2->GetTreeID() == TreeNodeID); 
-#else 
+#else
   cout << endl << "THE TEST IS NOT COMPLETE !!!" << endl;
-#endif  
+#endif
 
   sm->Close(study);
 }

diff --git a/src/SALOMEDS/Test/SALOMEDSTest_Study.cxx b/src/SALOMEDS/Test/SALOMEDSTest_Study.cxx
index e012eb8b7e120cd55babca3e06b49a11497af52f..fa275f9a23dd2d39403061a900f03d301b041091 100755 (executable)
--- a/src/SALOMEDS/Test/SALOMEDSTest_Study.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest_Study.cxx
@@ -89,6 +89,10 @@ void SALOMEDSTest::testStudy()
   CPPUNIT_ASSERT(name_attr_sco1);
   name_attr_sco1->SetValue("sco1");
 
+  //Check method GetComponentNames
+  vector<string> components = study->GetComponentNames(""); //The context doesn't matter
+  CPPUNIT_ASSERT(components.size() == 1 && components[0] == "sco1");
+
   //Check method FindComponentID
   _PTR(SComponent) sco3 = study->FindComponentID(sco1->GetID());
   CPPUNIT_ASSERT(sco3 && sco3->GetID() == sco1->GetID());
@@ -155,7 +159,7 @@ void SALOMEDSTest::testStudy()
   locid_attr_sco1->SetValue(16661); //DIRECTORYID
   _PTR(AttributeLocalID) locid_attr_so1 = studyBuilder->FindOrCreateAttribute(so1, "AttributeLocalID");
   CPPUNIT_ASSERT(locid_attr_so1);
-  locid_attr_sco1->SetValue(16661); //DIRECTORYID
+  locid_attr_so1->SetValue(16661); //DIRECTORYID
   vs = study->GetDirectoryNames(""); //Empty context (the current is taken)
   CPPUNIT_ASSERT(vs.size() == 2);