Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Deleted Study as an input parameter and class field.
[modules/kernel.git]
/
src
/
SALOMEDS
/
Test
/
SALOMEDSTest_UseCase.cxx
diff --git
a/src/SALOMEDS/Test/SALOMEDSTest_UseCase.cxx
b/src/SALOMEDS/Test/SALOMEDSTest_UseCase.cxx
index c2c2d7af43bae061d803f6b206e9a11963d069df..30455b5caa51b502c9e065d55346b9cc1cc98e63 100755
(executable)
--- a/
src/SALOMEDS/Test/SALOMEDSTest_UseCase.cxx
+++ b/
src/SALOMEDS/Test/SALOMEDSTest_UseCase.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// 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
// 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.
+// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-29,12
+29,9
@@
void SALOMEDSTest::testUseCase()
{
void SALOMEDSTest::testUseCase()
{
- //Create or find the Study manager
- _PTR(StudyManager) sm ( new SALOMEDS_StudyManager(_sm) );
- CPPUNIT_ASSERT(sm);
+ //Create Study
+ _PTR(Study) study(new SALOMEDS_Study(_study));
- //Create a new study
- _PTR(Study) study = sm->NewStudy("TestSObject");
CPPUNIT_ASSERT(study);
//Create Study Builder
CPPUNIT_ASSERT(study);
//Create Study Builder
@@
-108,6
+105,10
@@
void SALOMEDSTest::testUseCase()
CPPUNIT_ASSERT(builder->HasChildren(so1));
CPPUNIT_ASSERT(!builder->HasChildren(so2));
CPPUNIT_ASSERT(builder->HasChildren(so1));
CPPUNIT_ASSERT(!builder->HasChildren(so2));
+ //Check method SortChildren
+ CPPUNIT_ASSERT(builder->SortChildren(so1, true));
+ CPPUNIT_ASSERT(!builder->SortChildren(so2, false));
+
//Check method Init of UseCaseIterator
it->Init(false); //Only the first level
CPPUNIT_ASSERT(it->More());
//Check method Init of UseCaseIterator
it->Init(false); //Only the first level
CPPUNIT_ASSERT(it->More());
@@
-144,7
+145,7
@@
void SALOMEDSTest::testUseCase()
CPPUNIT_ASSERT(it->More());
CPPUNIT_ASSERT(it->Value()->GetID() == so1->GetID());
CPPUNIT_ASSERT(it->More());
CPPUNIT_ASSERT(it->Value()->GetID() == so1->GetID());
- s
m->Close(study
);
+ s
tudy->Clear(
);
}
#undef SALOMEDS_ALL_TESTS
}
#undef SALOMEDS_ALL_TESTS