Merge branch 'V7_dev'

[modules/yacs.git] / src / SALOMEDS / Test / SALOMEDSTest_AttributeComment.cxx

diff --git a/src/SALOMEDS/Test/SALOMEDSTest_AttributeComment.cxx b/src/SALOMEDS/Test/SALOMEDSTest_AttributeComment.cxx
index ce401624f85595fbdf9e3785be1cef68b045a7e6..6c93cd649dbdcf287a5e8fb53a1ea19f3c72fdae 100755 (executable)
--- a/src/SALOMEDS/Test/SALOMEDSTest_AttributeComment.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest_AttributeComment.cxx
@@ -1,24 +1,25 @@
-// Copyright (C) 2006  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// 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
-// 
+//
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either 
-// version 2.1 of the License.
-// 
-// This library is distributed in the hope that it will be useful 
-// but WITHOUT ANY WARRANTY; without even the implied warranty of 
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Lesser General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-
 /*!
  * Check all methods of SALOMEDS_AttributeComment
  * Use code of SALOMEDS_AttributeComment.cxx
@@ -32,7 +33,12 @@ void SALOMEDSTest::testAttributeComment()
   CPPUNIT_ASSERT(sm);
 
   //Create a new study
-  _PTR(Study) study = sm->NewStudy("Test");
+  std::vector<std::string> ost(sm->GetOpenStudies());
+  _PTR(Study) study;
+  if(ost.empty())
+    study = sm->NewStudy("Test");
+  else
+    study = sm->GetStudyByName(ost[0]);
 
   CPPUNIT_ASSERT(study);
 
@@ -52,7 +58,7 @@ void SALOMEDSTest::testAttributeComment()
   CPPUNIT_ASSERT(_attr);
 
   //Check method Value
-  string value = _attr->Value();
+  std::string value = _attr->Value();
 
   CPPUNIT_ASSERT(value.empty());