Merge multi-study removal branch.

[modules/kernel.git] / src / SALOMEDS / Test / SALOMEDSTest_SObject.cxx

diff --git a/src/SALOMEDS/Test/SALOMEDSTest_SObject.cxx b/src/SALOMEDS/Test/SALOMEDSTest_SObject.cxx
index 0062e60577331b677cdb6bcc473181c4058b7c5d..4da0748a895d15b16a064e9e4e4bdc18e197deb1 100755 (executable)
--- a/src/SALOMEDS/Test/SALOMEDSTest_SObject.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest_SObject.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -27,13 +27,8 @@
 
 void SALOMEDSTest::testSObject()
 {
-  //Create or find the Study manager
-  _PTR(StudyManager) sm ( new SALOMEDS_StudyManager(_sm) );
-
-  CPPUNIT_ASSERT(sm);
-
-  //Create a new study
-  _PTR(Study) study = sm->NewStudy("TestSObject");
+  //Create Study
+  _PTR(Study) study(new SALOMEDS_Study(_study));
 
   CPPUNIT_ASSERT(study);
 
@@ -71,7 +66,7 @@ void SALOMEDSTest::testSObject()
   _PTR(AttributeName) _attrName = studyBuilder->FindOrCreateAttribute(so, "AttributeName");
   _PTR(AttributeComment) _attrComment = studyBuilder->FindOrCreateAttribute(so, "AttributeComment"); 
 
-   std::string ior = _orb->object_to_string(_sm);
+   std::string ior = _orb->object_to_string(_study);
   _attrIOR->SetValue(ior);
   _attrName->SetValue("SO name");
   _attrComment->SetValue("SO comment");
@@ -92,9 +87,6 @@ void SALOMEDSTest::testSObject()
   CPPUNIT_ASSERT(so->FindSubObject(1, so2));
   CPPUNIT_ASSERT(so2->GetID() == so1->GetID());
 
-  //Check method GetStudy
-  CPPUNIT_ASSERT(so->GetStudy()->StudyId() == study->StudyId());
-
   //Check methods Name
   so->Name("test");
   CPPUNIT_ASSERT(so->Name() == "test");
@@ -120,7 +112,7 @@ void SALOMEDSTest::testSObject()
   CORBA::Object_var obj = dynamic_cast<SALOMEDS_SObject*>(so.get())->GetObject();
   CPPUNIT_ASSERT(!CORBA::is_nil(obj));
 
-  sm->Close(study);
+  study->Clear();
 }