Merge from V6_main_20120808 08Aug12

[modules/hexablock.git] / src / TEST_CPP / ModelTest.cxx

diff --git a/src/TEST_CPP/ModelTest.cxx b/src/TEST_CPP/ModelTest.cxx
index 0b6898a11021529fb6cf65446d617d3560822f7b..28da6050a5dd864f8e9550a1ca97bba7e5291ec0 100755 (executable)
--- a/src/TEST_CPP/ModelTest.cxx
+++ b/src/TEST_CPP/ModelTest.cxx
@@ -1,3 +1,22 @@
+// Copyright (C) 2009-2012  CEA/DEN, EDF R&D
+//
+// 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
+// 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
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
 #include <cppunit/extensions/HelperMacros.h>
 
 
@@ -39,7 +58,7 @@ ModelTest::~ModelTest(void)
 void ModelTest::_print_propagations (Hex::Document* doc)
 {
    int nb = doc->countPropagation ();
-   Display (nb);
+   HexDisplay (nb);
    for (int nro=0 ; nro<nb ; nro++)
        {
        Hex::Propagation*  prop  = doc ->getPropagation (nro);
@@ -99,7 +118,7 @@ void ModelTest::Test_cartesi1 ()
    const int size_z = 8;
 
    Hex::Hex mon_ex;
-   Hex::Document* doc = mon_ex.addDocument ();
+   Hex::Document* doc = mon_ex.addDocument ("foo");
    Hex::Vertex* orig = doc->addVertex (0,0,0);
 
    Hex::Vector*   dir  = doc->addVector (1,1,1);
@@ -144,7 +163,7 @@ void ModelTest::Test_find ()
    const int size_z = 2;
 
    Hex::Hex mon_ex;
-   Hex::Document* doc = mon_ex.addDocument ();
+   Hex::Document* doc = mon_ex.addDocument ("foo");
 
    Hex::Vertex* orig = doc->addVertex (0,0,0);
    Hex::Vector* dir  = doc->addVector (1,1,1);
@@ -189,7 +208,7 @@ void ModelTest::Test_joint ()
    const int dimz = 2;
 
    Hex::Hex mon_ex;
-   Hex::Document* doc = mon_ex.addDocument ();
+   Hex::Document* doc = mon_ex.addDocument ("foo");
 
    Hex::Vertex* orig1 = doc->addVertex (0,0,0);
    Hex::Vector* dir   = doc->addVector (1,1,1);
@@ -241,7 +260,7 @@ void ModelTest::Test_prism ()
    const int dimz = 2;
 
    Hex::Hex mon_ex;
-   Hex::Document* doc = mon_ex.addDocument ();
+   Hex::Document* doc = mon_ex.addDocument ("foo");
 
    Hex::Vertex* orig1 = doc->addVertex (0,0,0);
    Hex::Vector* dir   = doc->addVector (1,1,1);
@@ -278,7 +297,7 @@ void ModelTest::Test_prism2 ()
     const int dimz = 2;
     
     Hex::Hex mon_ex;
-    Hex::Document* doc = mon_ex.addDocument ();
+    Hex::Document* doc = mon_ex.addDocument ("foo");
     
     Hex::Vertex* orig1 = doc->addVertex (0,0,0);
     Hex::Vector* dir   = doc->addVector (1,1,1);
@@ -321,7 +340,7 @@ void ModelTest::Test_hexa1 ()
    const int size_z = 1;
 
    Hex::Hex mon_ex;
-   Hex::Document* doc = mon_ex.addDocument ();
+   Hex::Document* doc = mon_ex.addDocument ("foo");
    Hex::Vertex* orig = doc->addVertex (0,0,0);
    Hex::Vector* dir  = doc->addVector (1,1,1);
    //  Hex::Elements*  grid = 
@@ -340,7 +359,7 @@ void ModelTest::Test_decoupage ()
    const int size_z = 1;
 
    Hex::Hex mon_ex;
-   Hex::Document* doc = mon_ex.addDocument ();
+   Hex::Document* doc = mon_ex.addDocument ("foo");
 
    Hex::Vertex* orig = doc->addVertex (0,0,0);
    Hex::Vector* dir  = doc->addVector (1,1,1);
@@ -367,7 +386,7 @@ void ModelTest::Test_gen_xml ()
    const int size_z = 2;
 
    Hex::Hex mon_ex;
-   Hex::Document* doc = mon_ex.addDocument ();
+   Hex::Document* doc = mon_ex.addDocument ("foo");
 
    Hex::Vertex* orig = doc->addVertex (0,0,0);
    Hex::Vector* dir  = doc->addVector (1,1,1);
@@ -407,8 +426,7 @@ void ModelTest::Test_gen_xml ()
    prop3->setWay (true);
 
    doc ->saveVtk ("mini.vtk");
-   doc ->setFile ("Essai");
-   doc ->saveFile ();
+   doc ->save ("Essai");
 
    CPPUNIT_ASSERT( true );
 }
@@ -424,6 +442,8 @@ void ModelTest::Test_relecture ()
 
    CPPUNIT_ASSERT( true );
 }
+
+
 // ======================================================== Test_clone
 void ModelTest::Test_clone ()
 {
@@ -433,7 +453,7 @@ void ModelTest::Test_clone ()
    const int size_z = 2;
 
    Hex::Hex mon_ex;
-   Hex::Document* doc = mon_ex.addDocument ();
+   Hex::Document* doc = mon_ex.addDocument ("foo");
 
    Hex::Vertex* orig = doc->addVertex (0,0,0);
    Hex::Vector* dir  = doc->addVector (1,1,1);
@@ -460,7 +480,7 @@ void ModelTest::Test_separ ()
    const int size_z = 2;
 
    Hex::Hex mon_ex;
-   Hex::Document* doc = mon_ex.addDocument ();
+   Hex::Document* doc = mon_ex.addDocument ("foo");
 
    Hex::Vertex* orig = doc->addVertex (0,0,0);
    Hex::Vector* dir  = doc->addVector (1,1,1);
@@ -477,7 +497,7 @@ void ModelTest::Test_separ ()
 // {
 //    
 //    Hex::Hex mon_ex;
-//    Hex::Document* doc = mon_ex.addDocument ();
+//    Hex::Document* doc = mon_ex.addDocument ("foo");
 // 
 //    Hex::Vertex* c2 = doc->addVertex (0,0,0);
 //    Hex::Vector* dz = doc->addVector (0,0,1);
@@ -504,7 +524,7 @@ void ModelTest::Test_grille_cyl ()
 {
    
    Hex::Hex mon_ex;
-   Hex::Document* doc = mon_ex.addDocument ();
+   Hex::Document* doc = mon_ex.addDocument ("foo");
 
    Hex::Vertex* orig1 = doc->addVertex ( 0, 0,0);
    Hex::Vertex* orig2 = doc->addVertex (10, 0,0);
@@ -543,7 +563,7 @@ void ModelTest::Test_cylinder ()
    cpchar fic_vtk = "cylindre";
 
    Hex::Hex mon_ex;
-   Hex::Document* doc = mon_ex.addDocument ();
+   Hex::Document* doc = mon_ex.addDocument ("foo");
 
    Hex::Vertex* orig1 = doc->addVertex (0, 0,0);
    Hex::Vertex* orig2 = doc->addVertex (50,0,0);
@@ -573,7 +593,7 @@ void ModelTest::Test_cylinder ()
 void ModelTest::myTest_croix ()
 {
   Hex::Hex mon_ex;
-  Hex::Document* doc = mon_ex.addDocument ();
+  Hex::Document* doc = mon_ex.addDocument ("foo");
 
 
 //   Hex::Vector* dx1 = doc->addVector( -1, 0, 0 );
@@ -621,7 +641,7 @@ void ModelTest::Test_croix ()
 {
    
    Hex::Hex mon_ex;
-   Hex::Document* doc = mon_ex.addDocument ();
+   Hex::Document* doc = mon_ex.addDocument ("foo");
 
    Hex::Vertex* ori1 = doc->addVertex ( 0,0,0);
    Hex::Vertex* ori2 = doc->addVertex (-5,0,5);
@@ -692,7 +712,7 @@ void ModelTest::Test_pipes ()
 {
    
    Hex::Hex mon_ex;
-   Hex::Document* doc = mon_ex.addDocument ();
+   Hex::Document* doc = mon_ex.addDocument ("foo");
 
    Hex::Vertex* ori1 = doc->addVertex ( 0,0,0);
    Hex::Vertex* ori2 = doc->addVertex (-5,0,5);
@@ -719,7 +739,7 @@ void ModelTest::Test_lorraine()
 {
    
    Hex::Hex mon_ex;
-   Hex::Document* doc = mon_ex.addDocument ();
+   Hex::Document* doc = mon_ex.addDocument ("foo");
 
    Hex::Vertex* ori1 = doc->addVertex ( 0,0,0);
    Hex::Vertex* ori2 = doc->addVertex (-5,0,5);
@@ -798,7 +818,7 @@ void ModelTest::Test_disconnect ()
    const int size_z = 1;
 
    Hex::Hex mon_ex;
-   Hex::Document* doc = mon_ex.addDocument ();
+   Hex::Document* doc = mon_ex.addDocument ("foo");
 
    Hex::Vertex*   orig1 = doc->addVertex (0,0,0);
    Hex::Vertex*   orig2 = doc->addVertex (4,0,0);
@@ -857,7 +877,7 @@ void ModelTest::Test_propagation ()
    const int size_z = 1;
 
    Hex::Hex mon_ex;
-   Hex::Document* doc = mon_ex.addDocument ();
+   Hex::Document* doc = mon_ex.addDocument ("foo");
 
    Hex::Vertex*   orig = doc->addVertex (0,0,0);
    Hex::Vector*   dir  = doc->addVector (1,1,1);
@@ -891,8 +911,7 @@ void ModelTest::Test_propagation ()
 
    doc->dump  ();
    doc->saveVtk ("Test_propagation.vtk");
-   doc->setFile ("Test_propagation");
-   doc->saveFile ();
+   doc->save    ("Test_propagation");
 
    CPPUNIT_ASSERT( true );
 }
@@ -905,7 +924,7 @@ void ModelTest::Test_move ()
    const int size_z = 2;
 
    Hex::Hex mon_ex;
-   Hex::Document* doc = mon_ex.addDocument ();
+   Hex::Document* doc = mon_ex.addDocument ("foo");
 
    Hex::Vertex* orig = doc->addVertex (0,0,0);
    Hex::Vector* dir  = doc->addVector (1,1,1);
@@ -942,7 +961,7 @@ void ModelTest::Test_deux_cyl ()
 {
    
    Hex::Hex mon_ex;
-   Hex::Document* doc = mon_ex.addDocument ();
+   Hex::Document* doc = mon_ex.addDocument ("foo");
 
    Hex::Vertex* orig1 = doc->addVertex (0,0,-5);
    Hex::Vertex* orig2 = doc->addVertex (-5,0,0);
@@ -978,7 +997,7 @@ void ModelTest::Test_transfo ()
    cpchar fic_vtk = "transfo";
 
    Hex::Hex mon_ex;
-   Hex::Document* doc = mon_ex.addDocument ();
+   Hex::Document* doc = mon_ex.addDocument ("foo");
    doc ->setLevel (1);
 
    Hex::Vertex* orig = doc->addVertex (0,0,0);