X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FLifeCycleCORBA%2FTest_LifeCycleCORBA.cxx;h=174faaccbed6ae798fc5ba0c99e47d5f30e998a9;hb=2e44426f61da038fedaa98b8c48e82d1dfcca29f;hp=c9f1e44bcec6f56069506b015370647b8adc8953;hpb=e6bfea36374791cd31c274a2f97df90dc60ddaf3;p=modules%2Fkernel.git diff --git a/src/LifeCycleCORBA/Test_LifeCycleCORBA.cxx b/src/LifeCycleCORBA/Test_LifeCycleCORBA.cxx index c9f1e44bc..174faaccb 100644 --- a/src/LifeCycleCORBA/Test_LifeCycleCORBA.cxx +++ b/src/LifeCycleCORBA/Test_LifeCycleCORBA.cxx @@ -1,50 +1,43 @@ -// SALOME LifeCycleCORBA : implementation of containers and engines life cycle both in Python and C++ +// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE // -// Copyright (C) 2003 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 -// 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 +// 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, 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 +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + +// SALOME LifeCycleCORBA : implementation of containers and engines life cycle both in Python and C++ // File : TestLifeCycleCORBA.cxx // Author : Paul RASCLE, EDF - MARC TAJCHMAN, CEA // Module : SALOME // $Header$ - +// #include -#ifndef WNT +#ifndef WIN32 #include #endif #include -#ifndef WNT #include CORBA_CLIENT_HEADER(SALOME_Component) #include CORBA_CLIENT_HEADER(SALOME_TestComponent) -#else -#include -#include -#endif #include "SALOME_NamingService.hxx" #include "SALOME_LifeCycleCORBA.hxx" #include "SALOME_FileTransferCORBA.hxx" #include "utilities.h" -#include - -using namespace std; +#include int main (int argc, char * argv[]) { @@ -68,11 +61,11 @@ int main (int argc, char * argv[]) // --- get a local container, // load an engine, and invoque methods on that engine - string containerName = "myServer"; + std::string containerName = "myServer"; MESSAGE("FindOrLoadComponent " + containerName + "/" + "SalomeTestComponent" ); - Engines::Component_var mycompo = - _LCC.FindOrLoad_Component(containerName.c_str(),"SalomeTestComponent"); + Engines::EngineComponent_var mycompo = + _LCC.FindOrLoad_Component(containerName.c_str(),"SalomeTestComponent"); ASSERT(!CORBA::is_nil(mycompo)); Engines::TestComponent_var m1; m1 = Engines::TestComponent::_narrow(mycompo); @@ -83,53 +76,53 @@ int main (int argc, char * argv[]) // --- get another container, // load an engine, and invoque methods on that engine - string containerName2 = "otherServer"; + std::string containerName2 = "otherServer"; - Engines::Component_var mycompo2 = - _LCC.FindOrLoad_Component(containerName2.c_str(),"SALOME_TestComponentPy"); + Engines::EngineComponent_var mycompo2 = + _LCC.FindOrLoad_Component(containerName2.c_str(),"SALOME_TestComponentPy"); ASSERT(!CORBA::is_nil(mycompo2)); Engines::TestComponent_var m2; m2 = Engines::TestComponent::_narrow(mycompo2); ASSERT(!CORBA::is_nil(m2)); SCRUTE(m2->instanceName()); - cout << m2->instanceName() << endl; + std::cout << m2->instanceName() << std::endl; MESSAGE("Coucou " << m2->Coucou(1L)); // --- get a third container, // load an engine, and invoque methods on that engine - Engines::Component_var mycompo3 = - _LCC.FindOrLoad_Component("totoPy","SALOME_TestComponentPy"); + Engines::EngineComponent_var mycompo3 = + _LCC.FindOrLoad_Component("totoPy","SALOME_TestComponentPy"); ASSERT(!CORBA::is_nil(mycompo3)); Engines::TestComponent_var m3 = Engines::TestComponent::_narrow(mycompo3); ASSERT(!CORBA::is_nil(m3)); - cout << m3->instanceName() << endl; + std::cout << m3->instanceName() << std::endl; // --- yet another container, with hostname, // load an engine, and invoque methods on that engine - string containerName4 = GetHostname(); + std::string containerName4 = Kernel_Utils::GetHostname(); containerName4 += "/titiPy"; - Engines::Component_var mycompo4 = - _LCC.FindOrLoad_Component(containerName4.c_str(),"SALOME_TestComponentPy"); + Engines::EngineComponent_var mycompo4 = + _LCC.FindOrLoad_Component(containerName4.c_str(),"SALOME_TestComponentPy"); ASSERT(!CORBA::is_nil(mycompo4)); Engines::TestComponent_var m4 = Engines::TestComponent::_narrow(mycompo4); ASSERT(!CORBA::is_nil(m4)); - cout << m4->instanceName() << endl; + std::cout << m4->instanceName() << std::endl; // --- try a local file transfer - string origFileName = "/home/prascle/petitfichier"; - SALOME_FileTransferCORBA transfer( GetHostname(), - origFileName); - string local = transfer.getLocalFile(); + std::string origFileName = "/home/prascle/petitfichier"; + SALOME_FileTransferCORBA transfer( Kernel_Utils::GetHostname(), + origFileName); + std::string local = transfer.getLocalFile(); SCRUTE(local); // --- try a file transfer from another computer origFileName = "/home/prascle/occ60.tgz"; SALOME_FileTransferCORBA transfer2( "cli76ce", - origFileName); + origFileName); local = transfer2.getLocalFile(); SCRUTE(local); local = transfer2.getLocalFile(); @@ -140,12 +133,6 @@ int main (int argc, char * argv[]) { INFOS("Caught system exception COMM_FAILURE -- unable to contact the object."); } -#ifndef WNT - catch(CORBA::SystemException&) - { - INFOS("Caught a CORBA::SystemException."); - } -#endif catch(CORBA::Exception&) { INFOS("Caught CORBA::Exception."); @@ -157,4 +144,3 @@ int main (int argc, char * argv[]) return 0; } -