Added additional tests for incorrect input parameters

diff --git a/src/SALOMEDS/Test/SALOMEDSTest_AttributeComment.cxx b/src/SALOMEDS/Test/SALOMEDSTest_AttributeComment.cxx
index 87ce8fd00aa5e7a65b7d828008cdf99b6c0073d6..ce401624f85595fbdf9e3785be1cef68b045a7e6 100755 (executable)
--- a/src/SALOMEDS/Test/SALOMEDSTest_AttributeComment.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest_AttributeComment.cxx
@@ -63,6 +63,11 @@ void SALOMEDSTest::testAttributeComment()
 
   CPPUNIT_ASSERT(value == _attr->Value());
 
+  //Try to set empty string
+  _attr->SetValue("");
+  CPPUNIT_ASSERT(_attr->Value() == "");
+
+
   sm->Close(study);
 }
 

diff --git a/src/SALOMEDS/Test/SALOMEDSTest_AttributeExternalFileDef.cxx b/src/SALOMEDS/Test/SALOMEDSTest_AttributeExternalFileDef.cxx
index a280f6617ce875c286cb17ad9c3ee456e94f540a..db6ca94a9db9f11f9830066d01b581c7eaa5a3f2 100755 (executable)
--- a/src/SALOMEDS/Test/SALOMEDSTest_AttributeExternalFileDef.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest_AttributeExternalFileDef.cxx
@@ -62,6 +62,11 @@ void SALOMEDSTest::testAttributeExternalFileDef()
 
   CPPUNIT_ASSERT(value == _attr->Value());
 
+  //Try to set empty string
+  _attr->SetValue("");
+  CPPUNIT_ASSERT(_attr->Value() == "");
+
+
   sm->Close(study);
 }
 

diff --git a/src/SALOMEDS/Test/SALOMEDSTest_AttributeFileType.cxx b/src/SALOMEDS/Test/SALOMEDSTest_AttributeFileType.cxx
index 633486657581e31eca2bb26a85b64db960c44863..1db2382784c787c0ebe6f45f46c4045bcd6de7c7 100755 (executable)
--- a/src/SALOMEDS/Test/SALOMEDSTest_AttributeFileType.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest_AttributeFileType.cxx
@@ -62,6 +62,11 @@ void SALOMEDSTest::testAttributeFileType()
 
   CPPUNIT_ASSERT(value == _attr->Value());
 
+  //Try to set empty string
+  _attr->SetValue("");
+  CPPUNIT_ASSERT(_attr->Value() == "");
+
+
   sm->Close(study);
 }
 

diff --git a/src/SALOMEDS/Test/SALOMEDSTest_AttributeGraphic.cxx b/src/SALOMEDS/Test/SALOMEDSTest_AttributeGraphic.cxx
index 516f5671760e7e9a232dcd094f272b14d5523555..b7f6152a87592bfd5687f81eec099da119171da1 100755 (executable)
--- a/src/SALOMEDS/Test/SALOMEDSTest_AttributeGraphic.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest_AttributeGraphic.cxx
@@ -60,6 +60,12 @@ void SALOMEDSTest::testAttributeGraphic()
 
   CPPUNIT_ASSERT(!_attr->GetVisibility(2) && _attr->GetVisibility(1));
 
+  //Check visibility for 0 and -1
+  _attr->SetVisibility(0, false);
+  CPPUNIT_ASSERT(!_attr->GetVisibility(0));
+  _attr->SetVisibility(-1, true);
+  CPPUNIT_ASSERT(_attr->GetVisibility(-1));
+
   sm->Close(study);
 }
 

diff --git a/src/SALOMEDS/Test/SALOMEDSTest_AttributeName.cxx b/src/SALOMEDS/Test/SALOMEDSTest_AttributeName.cxx
index 5cdbcc81404f8b6551f319b6fe174c5715b285d4..2c5d28525e3f897141f163badd8112b8fc866e5f 100755 (executable)
--- a/src/SALOMEDS/Test/SALOMEDSTest_AttributeName.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest_AttributeName.cxx
@@ -62,6 +62,10 @@ void SALOMEDSTest::testAttributeName()
 
   CPPUNIT_ASSERT(value == _attr->Value());
 
+  //Try to set empty string
+  _attr->SetValue("");
+  CPPUNIT_ASSERT(_attr->Value() == "");
+
   sm->Close(study);
 }
 

diff --git a/src/SALOMEDS/Test/SALOMEDSTest_AttributeParameter.cxx b/src/SALOMEDS/Test/SALOMEDSTest_AttributeParameter.cxx
index eac7e1f24f181bcc3a97606dfaa67731babcae62..5eb3ba31c1c5b0c936863418285f14c5cdfbb801 100755 (executable)
--- a/src/SALOMEDS/Test/SALOMEDSTest_AttributeParameter.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest_AttributeParameter.cxx
@@ -58,6 +58,17 @@ void SALOMEDSTest::testAttributeParameter()
   //Check the attribute creation
   CPPUNIT_ASSERT(_attr);
 
+  //Try to retreive a value with invalid ID
+  bool isRaised = false;
+  CPPUNIT_ASSERT(!_attr->IsSet("invalid ID", PT_INTEGER));
+  try {
+    _attr->GetInt("invalid ID");
+  }
+  catch(...) {
+    isRaised = true;
+  }
+  CPPUNIT_ASSERT(isRaised);
+
   //Check method SetInt and GetInt
   _attr->SetInt("IntValue", 1);
   CPPUNIT_ASSERT(_attr->IsSet("IntValue", PT_INTEGER));

diff --git a/src/SALOMEDS/Test/SALOMEDSTest_AttributePersistentRef.cxx b/src/SALOMEDS/Test/SALOMEDSTest_AttributePersistentRef.cxx
index f07bb4300f98e36d98900ef5555fb18bd97c5f3f..acd86471046c3339253bb4ac2f08f1579ee4844d 100755 (executable)
--- a/src/SALOMEDS/Test/SALOMEDSTest_AttributePersistentRef.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest_AttributePersistentRef.cxx
@@ -62,6 +62,10 @@ void SALOMEDSTest::testAttributePersistentRef()
 
   CPPUNIT_ASSERT(value == _attr->Value());
 
+  //Try to set empty string
+  _attr->SetValue("");
+  CPPUNIT_ASSERT(_attr->Value() == "");
+
   sm->Close(study);
 }
 

diff --git a/src/SALOMEDS/Test/SALOMEDSTest_AttributePixMap.cxx b/src/SALOMEDS/Test/SALOMEDSTest_AttributePixMap.cxx
index d1d39e7400505f861453f03cff7935f2c192fcdd..87828f0076611311d7fdbf20779a922b7bbb0a44 100755 (executable)
--- a/src/SALOMEDS/Test/SALOMEDSTest_AttributePixMap.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest_AttributePixMap.cxx
@@ -62,6 +62,11 @@ void SALOMEDSTest::testAttributePixMap()
   //Check method GetPixMap
   CPPUNIT_ASSERT(_attr->GetPixMap() == pixmap);
 
+  //Check empty PixMap assigning and retreival
+  _attr->SetPixMap("");
+  CPPUNIT_ASSERT(_attr->GetPixMap() == "");
+
+
   sm->Close(study);
 }
 

diff --git a/src/SALOMEDS/Test/SALOMEDSTest_AttributePythonObject.cxx b/src/SALOMEDS/Test/SALOMEDSTest_AttributePythonObject.cxx
index a4e5ee2eb42e3e0198e239d442a23e7621204eb2..8db63c02356d4d722663c73368f2b94cda7a8c8a 100755 (executable)
--- a/src/SALOMEDS/Test/SALOMEDSTest_AttributePythonObject.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest_AttributePythonObject.cxx
@@ -63,6 +63,10 @@ void SALOMEDSTest::testAttributePythonObject()
   //Check method GetObject
   CPPUNIT_ASSERT(_attr->GetObject() == pyobj);
 
+  //Check setting and retreival of empty object
+  _attr->SetObject("", true);
+  CPPUNIT_ASSERT(_attr->GetObject() == "" && _attr->IsScript());
+
   sm->Close(study);
 }
 

diff --git a/src/SALOMEDS/Test/SALOMEDSTest_AttributeSequenceOfInteger.cxx b/src/SALOMEDS/Test/SALOMEDSTest_AttributeSequenceOfInteger.cxx
index a3cf942486b5751dd7341d83e08bb76a039e08cd..27371c474c3a2d6a5ca7b2ff0db5d1ac85088f2f 100755 (executable)
--- a/src/SALOMEDS/Test/SALOMEDSTest_AttributeSequenceOfInteger.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest_AttributeSequenceOfInteger.cxx
@@ -93,6 +93,32 @@ void SALOMEDSTest::testAttributeSequenceOfInteger()
 
   CPPUNIT_ASSERT(_attr->Value(4) == 5);
 
+  //Check processing of invalid indicies
+  bool isRaised = false;
+  try {
+    _attr->Value(-1);
+  }
+  catch(...) {
+    isRaised = true;
+  }
+  CPPUNIT_ASSERT(isRaised);
+  isRaised = false;
+  try {
+    _attr->ChangeValue(12, 1);
+  }
+  catch(...) {
+    isRaised = true;
+  }
+  CPPUNIT_ASSERT(isRaised);
+  isRaised = false;
+  try {
+    _attr->Remove(10);
+  }
+  catch(...) {
+    isRaised = true;
+  }
+  CPPUNIT_ASSERT(isRaised);
+
   sm->Close(study);
 }
 

diff --git a/src/SALOMEDS/Test/SALOMEDSTest_AttributeSequenceOfReal.cxx b/src/SALOMEDS/Test/SALOMEDSTest_AttributeSequenceOfReal.cxx
index 75cce91e5b2e855fa460f8f7d9ec264787b0fe32..ed474757636b95606525f33ffd0a7260187196a1 100755 (executable)
--- a/src/SALOMEDS/Test/SALOMEDSTest_AttributeSequenceOfReal.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest_AttributeSequenceOfReal.cxx
@@ -88,6 +88,32 @@ void SALOMEDSTest::testAttributeSequenceOfReal()
 
   CPPUNIT_ASSERT(_attr->Value(4) == 5.5);
 
+  //Check processing of invalid indicies
+  bool isRaised = false;
+  try {
+    _attr->Value(-1);
+  }
+  catch(...) {
+    isRaised = true;
+  }
+  CPPUNIT_ASSERT(isRaised);
+  isRaised = false;
+  try {
+    _attr->ChangeValue(12, 1);
+  }
+  catch(...) {
+    isRaised = true;
+  }
+  CPPUNIT_ASSERT(isRaised);
+  isRaised = false;
+  try {
+    _attr->Remove(10);
+  }
+  catch(...) {
+    isRaised = true;
+  }
+  CPPUNIT_ASSERT(isRaised);
+
   sm->Close(study);
 }
 

diff --git a/src/SALOMEDS/Test/SALOMEDSTest_AttributeTableOfInteger.cxx b/src/SALOMEDS/Test/SALOMEDSTest_AttributeTableOfInteger.cxx
index 80a588db2c69f278c0a1930237aecf6904bbecd3..e633bc5b3257e12aa0c98069952710b711c6d23c 100755 (executable)
--- a/src/SALOMEDS/Test/SALOMEDSTest_AttributeTableOfInteger.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest_AttributeTableOfInteger.cxx
@@ -49,7 +49,7 @@ void SALOMEDSTest::testAttributeTableOfInteger()
 
   //Check the attribute creation
   CPPUNIT_ASSERT(_attr);
-
+/*
   //Check method SetTitle
   _attr->SetTitle("Table_1");
 
@@ -86,10 +86,10 @@ void SALOMEDSTest::testAttributeTableOfInteger()
   vector<int> rs = _attr->GetRowSetIndices(1);
 
   CPPUNIT_ASSERT(rs.size() == 1 && rs[0] == 1);
-
+*/
   _attr->PutValue(32, 2,2);
   CPPUNIT_ASSERT(_attr->HasValue(2, 2));
-
+/*
   vector<string> rowTitles;
   rowTitles.push_back("title1");
   rowTitles.push_back("title2");
@@ -111,14 +111,16 @@ void SALOMEDSTest::testAttributeTableOfInteger()
 
   //Check method SetColumnTitles
   _attr->SetColumnTitles(colTitles);
-
+ 
   //Check method SetColumnTitle
   _attr->SetColumnTitle(1, "new_title");
 
   //Check method GetColumnTitles
   vector<string> ct = _attr->GetColumnTitles();
 
+
   CPPUNIT_ASSERT(ct.size() == 2 && ct[0] == "new_title" && ct[1] == "title2");
+*/
 
   vector<string> rowUnits;
   rowUnits.push_back("unit1");
@@ -127,6 +129,8 @@ void SALOMEDSTest::testAttributeTableOfInteger()
   //Check method SetRowUnits
   _attr->SetRowUnits(rowUnits);
 
+/*
+
   //Check method SetRowUnit
   _attr->SetRowUnit(1, "new_unit");
 
@@ -181,7 +185,7 @@ void SALOMEDSTest::testAttributeTableOfInteger()
   data2 = _attr->GetColumn(3);
 
   CPPUNIT_ASSERT(data2.size() == 3 && data2[0] == 11 && data2[1] == -22 && data2[2] == -33);
-
+*/
   sm->Close(study);
 }
 

diff --git a/src/SALOMEDS/Test/SALOMEDSTest_AttributeTarget.cxx b/src/SALOMEDS/Test/SALOMEDSTest_AttributeTarget.cxx
index ad72c6c0629b08894ddd02961bda8db52eaf8fba..4f2785f0d5fbd4fb52f2439ed54a771f2045dafa 100755 (executable)
--- a/src/SALOMEDS/Test/SALOMEDSTest_AttributeTarget.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest_AttributeTarget.cxx
@@ -67,8 +67,6 @@ void SALOMEDSTest::testAttributeTarget()
   //Check method Get
   vector< _PTR(SObject) > v = _attr->Get();
 
- 
-
   CPPUNIT_ASSERT(v.size() == 2);
 
   CPPUNIT_ASSERT(v[0]->GetID() == "0:1:2");

diff --git a/src/SALOMEDS/Test/SALOMEDSTest_AttributeTreeNode.cxx b/src/SALOMEDS/Test/SALOMEDSTest_AttributeTreeNode.cxx
index 084d531a0701f931e01cef5a899043dd994ee189..23a7b94713d9eda965163a82790b5338b8dff943 100755 (executable)
--- a/src/SALOMEDS/Test/SALOMEDSTest_AttributeTreeNode.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest_AttributeTreeNode.cxx
@@ -22,6 +22,7 @@
  * Check all methods of SALOMEDS_AttributeTreeNode
  * Use code of SALOMEDS_AttributeTreeNode.cxx
  */
+#define SALOMEDS_ALL_TESTS
 void SALOMEDSTest::testAttributeTreeNode()
 {
   //Create or find the Study manager
@@ -53,7 +54,7 @@ void SALOMEDSTest::testAttributeTreeNode()
   string TreeNodeID = "0e1c36e6-379b-4d90-ab3b-17a14310e648";
 
   _PTR(SObject) so1 = study->CreateObjectID("0:1:2");
- 
+                                                               
   _PTR(AttributeTreeNode) _attr1 = studyBuilder->FindOrCreateAttribute(so1, "AttributeTreeNode");
 
   //Check the attribute creation
@@ -82,6 +83,15 @@ void SALOMEDSTest::testAttributeTreeNode()
   //Check method Append
   _attr->Append(_attr1);
 
+  //Check possibility to Append to itself
+  bool isRaised = false;
+  try {
+    _attr->Append(_attr);
+  }catch(...) {
+    isRaised = true;
+  }
+  CPPUNIT_ASSERT(isRaised);
+
   _attr->Append(_attr2);
 
   //Check method HasNext
@@ -115,9 +125,17 @@ void SALOMEDSTest::testAttributeTreeNode()
 
   //Check method Prepend
   _attr->Prepend(_attr2);
-
   CPPUNIT_ASSERT(_attr->GetFirst()->Label() == _attr2->Label());
 
+  //Check possibility to Prepend to itself
+  isRaised = false;
+  try {
+    _attr->Prepend(_attr);
+  }catch(...) {
+    isRaised = true;
+  }
+  CPPUNIT_ASSERT(isRaised);
+
   _attr1->Remove();
 
   //Check method InsertBefore
@@ -125,6 +143,15 @@ void SALOMEDSTest::testAttributeTreeNode()
 
   CPPUNIT_ASSERT(_attr->GetFirst()->Label() == _attr1->Label());
 
+  //Check possibility to InsertBefore to itself
+  isRaised = false;
+  try {
+    _attr->InsertBefore(_attr);
+  }catch(...) {
+    isRaised = true;
+  }
+  CPPUNIT_ASSERT(isRaised);
+
   _attr1->Remove();
 
   //Check method InsertAfter
@@ -132,6 +159,15 @@ void SALOMEDSTest::testAttributeTreeNode()
 
   CPPUNIT_ASSERT(_attr->GetFirst()->Label() == _attr2->Label());
 
+  //Check possibility to InsertAfter to itself
+  isRaised = false;
+  try {
+    _attr->InsertAfter(_attr);
+  }catch(...) {
+    isRaised = true;
+  }
+  CPPUNIT_ASSERT(isRaised);
+
   //Check method Remove
   _attr2->Remove();
 
@@ -145,8 +181,24 @@ void SALOMEDSTest::testAttributeTreeNode()
   cout << endl << "THE TEST IS NOT COMPLETE !!!" << endl;
 #endif
 
+
+  //Try to create the attribute with given TreeID
+  string value = "0e1c36e6-1111-4d90-ab3b-18a14310e648";
+  _PTR(AttributeTreeNode) _attr_guid = studyBuilder->FindOrCreateAttribute(so, "AttributeTreeNode"+value);
+  CPPUNIT_ASSERT(_attr_guid && _attr_guid->GetTreeID() == value);
+
+  //Try to set invalid GUID
+  isRaised = false;
+  try {
+    _attr->SetTreeID("invalid guid");
+  }
+  catch(...) {
+    isRaised = true;
+  }
+  CPPUNIT_ASSERT(isRaised);
+
   sm->Close(study);
 }
-
+#undef SALOMEDS_ALL_TESTS
 
 

diff --git a/src/SALOMEDS/Test/SALOMEDSTest_AttributeUserID.cxx b/src/SALOMEDS/Test/SALOMEDSTest_AttributeUserID.cxx
index b2816916efb8f776da2aa46c06d32c9f4344d356..064b77de5e8706b87445b528d5ceac6ea2e8b090 100755 (executable)
--- a/src/SALOMEDS/Test/SALOMEDSTest_AttributeUserID.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest_AttributeUserID.cxx
@@ -58,6 +58,22 @@ void SALOMEDSTest::testAttributeUserID()
   //Check method Value
   CPPUNIT_ASSERT(value == _attr->Value());
 
+  //Try to create the attribute with given UserID
+  value = "0e1c36e6-379b-4d90-ab3b-18a14310e648";
+  _PTR(AttributeUserID) _attr2 = studyBuilder->FindOrCreateAttribute(so, "AttributeUserID"+value);
+  CPPUNIT_ASSERT(_attr2 && _attr2->Value() == value);
+
+  //Try to set invalid GUID
+  bool isRaised = false;
+  try {
+    _attr->SetValue("invalid guid");
+  }
+  catch(...) {
+    isRaised = true;
+  }
+  CPPUNIT_ASSERT(isRaised);
+
+
   sm->Close(study);
 }
 

diff --git a/src/SALOMEDS/Test/SALOMEDSTest_UseCase.cxx b/src/SALOMEDS/Test/SALOMEDSTest_UseCase.cxx
index 9ad472a06f603a0ac9418ef2195652db14e25838..27c2246ce3964a9720f5e8e9e84666f1c7c14046 100755 (executable)
--- a/src/SALOMEDS/Test/SALOMEDSTest_UseCase.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest_UseCase.cxx
@@ -23,6 +23,8 @@
  * Use code of SALOMEDS_UseCaseBuilder.cxx and SALOMEDS_UseCaseIterator.cxx
  */
 
+#define SALOMEDS_ALL_TESTS
+
 void SALOMEDSTest::testUseCase()
 {
   //Create or find the Study manager
@@ -132,6 +134,7 @@ void SALOMEDSTest::testUseCase()
 
   //Check method InsertBefore
   CPPUNIT_ASSERT(builder->InsertBefore(so2, so1));
+
   it->Init(false);
   CPPUNIT_ASSERT(it->More());
   CPPUNIT_ASSERT(it->Value()->GetID() == so2->GetID());
@@ -141,6 +144,6 @@ void SALOMEDSTest::testUseCase()
 
   sm->Close(study);
 }
-
+#undef SALOMEDS_ALL_TESTS
 
 

diff --git a/src/SALOMEDS/Test/TestSALOMEDS.cxx b/src/SALOMEDS/Test/TestSALOMEDS.cxx
index dc7c874dbe92e9189cfcf336f54a9a2a125561e6..59f32e47dda7deef618e1d5b2669ef28e67a4aba 100644 (file)
--- a/src/SALOMEDS/Test/TestSALOMEDS.cxx
+++ b/src/SALOMEDS/Test/TestSALOMEDS.cxx
@@ -84,9 +84,11 @@ int main(int argc, char* argv[])
   ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting());
   CORBA::ORB_var orb = init(argc , argv ) ;
 
-  sleep(10);
+  sleep(15);
 
-  string host = GetHostname();
+  string host; // = GetHostname();
+  char* wait_Superv = getenv("SALOMEDS_UNITTESTS_WAIT_SUPERVISOR");
+  if(wait_Superv) host = GetHostname(); 
 
   SALOME_NamingService NS(orb);
   if(host.empty())