X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2Ftest_HYDROData_Entity.cxx;h=285d9972ce1243b8c852a4e32390cf5b634471fb;hb=3bece499e83cc9ca95536228c7f6740030e9d5d8;hp=e55530bbfb3525c98b23239c3a473111b7536767;hpb=557f5f91d30a5fae83a018a79eeb445c8c51ec3d;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/test_HYDROData_Entity.cxx b/src/HYDRO_tests/test_HYDROData_Entity.cxx
index e55530bb..285d9972 100644
--- a/src/HYDRO_tests/test_HYDROData_Entity.cxx
+++ b/src/HYDRO_tests/test_HYDROData_Entity.cxx
@@ -25,7 +25,7 @@
 
 void test_HYDROData_Entity::testName()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_Entity) anObj = aDoc->CreateObject(KIND_IMAGE); // any object
   static const QString aName("test_name");
@@ -37,7 +37,7 @@ void test_HYDROData_Entity::testName()
 
 void test_HYDROData_Entity::testRemove()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   
   Handle(HYDROData_Entity) anObj = aDoc->CreateObject(KIND_IMAGE); // any object
   CPPUNIT_ASSERT(!anObj->IsRemoved());
@@ -49,7 +49,7 @@ void test_HYDROData_Entity::testRemove()
 
 void test_HYDROData_Entity::testCopy()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_Entity) anObj = aDoc->CreateObject(KIND_IMAGE); // any object
   static const QString aName("test_name");
@@ -57,10 +57,46 @@ void test_HYDROData_Entity::testCopy()
 
   Handle(HYDROData_Entity) aCopy = aDoc->CreateObject(KIND_IMAGE); // object for copy
   CPPUNIT_ASSERT(aCopy->GetName().isEmpty());
-  anObj->CopyTo(aCopy, true);
+  anObj->CopyTo(aCopy, false);
 
   // check the copied object has same name as original
   CPPUNIT_ASSERT_EQUAL(aName.toStdString(), aCopy->GetName().toStdString());
 
   aDoc->Close();
 }
+
+void test_HYDROData_Entity::testPythonNameChoice()
+{
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
+
+  Handle(HYDROData_Entity) anObj = aDoc->CreateObject(KIND_IMAGE); // any object
+  
+  anObj->SetName("test");
+  CPPUNIT_ASSERT_EQUAL( anObj->GetObjPyName().toStdString(), std::string( "test" ) );
+
+  anObj->SetName("test_1");
+  CPPUNIT_ASSERT_EQUAL( anObj->GetObjPyName().toStdString(), std::string( "test_1" ) );
+
+  anObj->SetName("test 1");
+  CPPUNIT_ASSERT_EQUAL( anObj->GetObjPyName().toStdString(), std::string( "test_1" ) );
+
+  anObj->SetName("  test abc    hello     ");
+  CPPUNIT_ASSERT_EQUAL( anObj->GetObjPyName().toStdString(), std::string( "__test_abc____hello_____" ) );
+
+  anObj->SetName("123");
+  CPPUNIT_ASSERT_EQUAL( anObj->GetObjPyName().toStdString(), std::string( "Image_123" ) );
+
+  anObj->SetName("  123");
+  CPPUNIT_ASSERT_EQUAL( anObj->GetObjPyName().toStdString(), std::string( "__123" ) );
+
+  aDoc->Close();
+}
+
+void test_HYDROData_Entity::testTypes()
+{
+  for( int i=0; i<KIND_LAST; i++ )
+  {
+    CPPUNIT_ASSERT_EQUAL( false, HYDROData_Entity::Type( (ObjectKind)i ).isEmpty() );
+    CPPUNIT_ASSERT_EQUAL( false, HYDROData_Entity::Type( (ObjectKind)i ).contains(' ') );
+  }
+}