diff options
Diffstat (limited to 'TAO/CIAO/DAnCE/tests')
10 files changed, 222 insertions, 219 deletions
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp index 6b117839019..a00a939f113 100644 --- a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp +++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp @@ -1,204 +1,17 @@ // $Id$ -#ifndef HANDLER_TEST_CPP -#define HANDLER_TEST_CPP #include "Handler_Test.h" -#include "ace/Get_Opt.h" -#include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "ace/OS_main.h" -#include "ace/Auto_Ptr.h" -#include "tao/Exception.h" -#include "Config_Handlers/XercesString.h" -#include <xercesc/util/XMLUniDefs.hpp> -#include "Config_Handlers/Config_Handler_export.h" -#include "Config_Handlers/DnC_Dump.h" -#include "Config_Handlers/Config_Error_Handler.h" +#ifdef ACE_HAS_BROKEN_NESTED_TEMPLATES -using Config_Handler::XStr; -using xercesc::XMLUni; -using xercesc::XMLString; -using xercesc::XMLException; -using xercesc::DOMException; -using xercesc::DOMBuilder; -using xercesc::DOMImplementationRegistry; -using xercesc::DOMImplementationLS; -using xercesc::DOMImplementation; -using xercesc::DOMAttr; -using xercesc::DOMNamedNodeMap; -using xercesc::DOMLocator; -using xercesc::DOMError; -using xercesc::DOMNodeList; -using xercesc::DOMDocument; -using xercesc::DOMDocumentTraversal; -using xercesc::DOMNodeIterator; -using xercesc::DOMNode; -using xercesc::DOMNodeFilter; - -void -usage (const ACE_TCHAR* program) +int +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Usage: %s -u <URI>\n") - ACE_TEXT (" <URI>: URI identifying the resource\n"), - program)); -} - -template <typename HANDLER, typename DATA> -int run_test (int argc, ACE_TCHAR *argv[], void (HANDLER::*func) (DATA&)) -{ - ACE_TCHAR* url = 0; - - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("u:")); - int c; - - while ((c = get_opt ()) != EOF) - { - switch (c) - { - case 'u': - url = get_opt.opt_arg(); - break; - default: - usage(argv[0]); - return -1; - } - } - - if (url == 0) { - usage (argv[0]); - return -1; - } - - // Initialize the ORB so that CORBA::Any will work - // - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ""); - - // Initialize the Xerces run-time - try - { - xercesc::XMLPlatformUtils::Initialize(); - } - - catch (const XMLException& e) - { - char* message = XMLString::transcode (e.getMessage()); - ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message); - ACE_DEBUG ((LM_DEBUG, "Error during initialization : %s\n", message)); - return 1; - } - - try - { - - // Instantiate the DOM parser. - static const XMLCh gLS[] = { xercesc::chLatin_L, - xercesc::chLatin_S, - xercesc::chNull }; - - // Get an implementation of the Load-Store (LS) interface - DOMImplementation* impl - = DOMImplementationRegistry::getDOMImplementation(gLS); - - auto_ptr<DOMImplementation> cleanup_impl (impl); - - // Create a DOMBuilder - DOMBuilder* parser = - ((DOMImplementationLS*)impl)->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0); - - auto_ptr<DOMBuilder> cleanup_builder (parser); - - // Discard comment nodes in the document - parser->setFeature (XMLUni::fgDOMComments, false); - - // Disable datatype normalization. The XML 1.0 attribute value - // normalization always occurs though. - parser->setFeature (XMLUni::fgDOMDatatypeNormalization, true); - - // Do not create EntityReference nodes in the DOM tree. No - // EntityReference nodes will be created, only the nodes - // corresponding to their fully expanded sustitution text will be - // created. - parser->setFeature (XMLUni::fgDOMEntities, false); - - // Perform Namespace processing. - parser->setFeature (XMLUni::fgDOMNamespaces, true); - - // Perform Validation - parser->setFeature (XMLUni::fgDOMValidation, true); - - // Do not include ignorable whitespace in the DOM tree. - parser->setFeature (XMLUni::fgDOMWhitespaceInElementContent, false); - - // Enable the parser schema support. - parser->setFeature (XMLUni::fgXercesSchema, true); - - // Enable full schema constraint checking, including checking which - // may be time-consuming or memory intensive. Currently, particle - // unique attribution constraint checking and particle derivation - // restriction checking are controlled by this option. - parser->setFeature (XMLUni::fgXercesSchemaFullChecking, true); - - // The parser will treat validation error as fatal and will exit. - parser->setFeature (XMLUni::fgXercesValidationErrorAsFatal, true); - - CIAO::Config_Handler::Config_Error_Handler handler; - parser->setErrorHandler(&handler); - - DOMDocument* doc = parser->parseURI(url); - auto_ptr<DOMDocument> cleanup_doc (doc); - - if (handler.getErrors()) - { - return 1; - } - HANDLER obj (doc, DOMNodeFilter::SHOW_ELEMENT | - DOMNodeFilter::SHOW_TEXT); - - DATA data; - (obj.*func)(data); - Deployment::DnC_Dump::dump (data); - //domain_handler.dump(domain); - - // parser->release (); - } - catch (const DOMException& e) - { - const unsigned int maxChars = 2047; - XMLCh errText[maxChars + 1]; - - ACE_ERROR ((LM_ERROR, "\nException occured while parsing %s: \n", url)); - ACE_ERROR ((LM_ERROR, "DOMException code: %d\n ", e.code)); - if (DOMImplementation::loadDOMExceptionMsg(e.code, errText, maxChars)) - { - char* message = XMLString::transcode (errText); - ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message); - ACE_ERROR ((LM_ERROR, "Message is: %s\n", message)); - } - return 1; - } - catch (const XMLException& e) - { - char* message = XMLString::transcode (e.getMessage()); - ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message); - ACE_ERROR ((LM_ERROR, "\nException occured: %s\n ", message)); - return 1; - } - catch (CORBA::Exception& ex) - { - ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: "); - return 1; - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "Caught unknown exception\n")); - return 1; - } - - xercesc::XMLPlatformUtils::Terminate(); - return 0; + ACE_TEXT ("DaNCe internal testing doesn't work with compilers ") + ACE_TEXT ("not supporting nested templates (like VC6).\n"))); + return -1; } +#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES -#endif /*HANDLER_TEST_CPP*/ diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.h b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.h index b51a6e4c00b..a5598e8a55c 100644 --- a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.h +++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.h @@ -6,6 +6,8 @@ #include "ace/Log_Msg.h" #include "ace/OS_main.h" +#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES + #include "ace/Get_Opt.h" #include "ace/Auto_Ptr.h" #include "tao/Exception.h" @@ -40,13 +42,9 @@ using xercesc::DOMNodeFilter; template <typename HANDLER, typename DATA> int run_test (int argc, ACE_TCHAR *argv[], void (HANDLER::*func) (DATA&)); +#include "Handler_Test.i" -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Handler_Test.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Handler_Test.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ +#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES #endif // HANDLER_TEST_H + diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.i b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.i index cfa1da318d3..eb6041b83d0 100644 --- a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.i +++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.i @@ -1 +1,197 @@ // $Id$ + +#include "ace/Get_Opt.h" +#include "ace/Auto_Ptr.h" +#include "ace/Log_Msg.h" +#include "ace/OS_main.h" +#include "ace/Auto_Ptr.h" +#include "tao/Exception.h" +#include "Config_Handlers/XercesString.h" +#include <xercesc/util/XMLUniDefs.hpp> +#include "Config_Handlers/Config_Handler_export.h" +#include "Config_Handlers/DnC_Dump.h" +#include "Config_Handlers/Config_Error_Handler.h" + +using Config_Handler::XStr; +using xercesc::XMLUni; +using xercesc::XMLString; +using xercesc::XMLException; +using xercesc::DOMException; +using xercesc::DOMBuilder; +using xercesc::DOMImplementationRegistry; +using xercesc::DOMImplementationLS; +using xercesc::DOMImplementation; +using xercesc::DOMAttr; +using xercesc::DOMNamedNodeMap; +using xercesc::DOMLocator; +using xercesc::DOMError; +using xercesc::DOMNodeList; +using xercesc::DOMDocument; +using xercesc::DOMDocumentTraversal; +using xercesc::DOMNodeIterator; +using xercesc::DOMNode; +using xercesc::DOMNodeFilter; + +inline void +usage (const ACE_TCHAR* program) +{ + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Usage: %s -u <URI>\n") + ACE_TEXT (" <URI>: URI identifying the resource\n"), + program)); +} + +template <typename HANDLER, typename DATA> +int run_test (int argc, ACE_TCHAR *argv[], void (HANDLER::*func) (DATA&)) +{ + ACE_TCHAR* url = 0; + + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("u:")); + int c; + + while ((c = get_opt ()) != EOF) + { + switch (c) + { + case 'u': + url = get_opt.opt_arg(); + break; + default: + usage(argv[0]); + return -1; + } + } + + if (url == 0) { + usage(argv[0]); + return -1; + } + + // Initialize the ORB so that CORBA::Any will work + // + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ""); + + // Initialize the Xerces run-time + try + { + xercesc::XMLPlatformUtils::Initialize(); + } + + catch (const XMLException& e) + { + char* message = XMLString::transcode (e.getMessage()); + ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message); + ACE_DEBUG ((LM_DEBUG, "Error during initialization : %s\n", message)); + return 1; + } + + try + { + + // Instantiate the DOM parser. + static const XMLCh gLS[] = { xercesc::chLatin_L, + xercesc::chLatin_S, + xercesc::chNull }; + + // Get an implementation of the Load-Store (LS) interface + DOMImplementation* impl + = DOMImplementationRegistry::getDOMImplementation(gLS); + + auto_ptr<DOMImplementation> cleanup_impl (impl); + + // Create a DOMBuilder + DOMBuilder* parser = + ((DOMImplementationLS*)impl)->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0); + + auto_ptr<DOMBuilder> cleanup_builder (parser); + + // Discard comment nodes in the document + parser->setFeature (XMLUni::fgDOMComments, false); + + // Disable datatype normalization. The XML 1.0 attribute value + // normalization always occurs though. + parser->setFeature (XMLUni::fgDOMDatatypeNormalization, true); + + // Do not create EntityReference nodes in the DOM tree. No + // EntityReference nodes will be created, only the nodes + // corresponding to their fully expanded sustitution text will be + // created. + parser->setFeature (XMLUni::fgDOMEntities, false); + + // Perform Namespace processing. + parser->setFeature (XMLUni::fgDOMNamespaces, true); + + // Perform Validation + parser->setFeature (XMLUni::fgDOMValidation, true); + + // Do not include ignorable whitespace in the DOM tree. + parser->setFeature (XMLUni::fgDOMWhitespaceInElementContent, false); + + // Enable the parser schema support. + parser->setFeature (XMLUni::fgXercesSchema, true); + + // Enable full schema constraint checking, including checking which + // may be time-consuming or memory intensive. Currently, particle + // unique attribution constraint checking and particle derivation + // restriction checking are controlled by this option. + parser->setFeature (XMLUni::fgXercesSchemaFullChecking, true); + + // The parser will treat validation error as fatal and will exit. + parser->setFeature (XMLUni::fgXercesValidationErrorAsFatal, true); + + CIAO::Config_Handler::Config_Error_Handler handler; + parser->setErrorHandler(&handler); + + DOMDocument* doc = parser->parseURI(url); + auto_ptr<DOMDocument> cleanup_doc (doc); + + if (handler.getErrors()) + { + return 1; + } + HANDLER obj (doc, DOMNodeFilter::SHOW_ELEMENT | + DOMNodeFilter::SHOW_TEXT); + + DATA data; + (obj.*func)(data); + Deployment::DnC_Dump::dump (data); + //domain_handler.dump(domain); + + // parser->release (); + } + catch (const DOMException& e) + { + const unsigned int maxChars = 2047; + XMLCh errText[maxChars + 1]; + + ACE_ERROR ((LM_ERROR, "\nException occured while parsing %s: \n", url)); + ACE_ERROR ((LM_ERROR, "DOMException code: %d\n ", e.code)); + if (DOMImplementation::loadDOMExceptionMsg(e.code, errText, maxChars)) + { + char* message = XMLString::transcode (errText); + ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message); + ACE_ERROR ((LM_ERROR, "Message is: %s\n", message)); + } + return 1; + } + catch (const XMLException& e) + { + char* message = XMLString::transcode (e.getMessage()); + ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message); + ACE_ERROR ((LM_ERROR, "\nException occured: %s\n ", message)); + return 1; + } + catch (CORBA::Exception& ex) + { + ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: "); + return 1; + } + catch (...) + { + ACE_ERROR ((LM_ERROR, "Caught unknown exception\n")); + return 1; + } + + xercesc::XMLPlatformUtils::Terminate(); + return 0; +} diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb b/TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb index 07bec27c7a4..fae3de02b21 100644 --- a/TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb +++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb @@ -1,16 +1,15 @@ //$Id$ -project : taoexe, ciao_server_dnc, ciao_deployment_stub { +project : taoexe, ciao_client_dnc, ciao_deployment_stub { // , portableserver, typecodefactory { dynamicflags = CONFIG_HANDLER_BUILD_DLL macros += XML_USE_PTHREADS requires += exceptions - includes += $(XERCESCROOT)/include $(ACE_ROOT)/TAO/CIAO/DAnCE - libpaths += $(XERCESCROOT)/lib + includes += $(XERCESCROOT)/include /usr/include $(ACE_ROOT)/TAO/CIAO/DAnCE + libpaths += $(XERCESCROOT)/lib /usr/lib // $(ACE_ROOT)/lib libs += xerces-c Config_Handlers // Deployment_stub Deployment_svnt -// libs += CIAO_DnC_Server CIAO_DnC_Container after += Config_Handlers - Template_Files { + Source_Files { Handler_Test.cpp } } diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc index d9048326040..23507cdc58c 100644 --- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc +++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc @@ -17,7 +17,6 @@ project(NodeAppTest_RoundTrip_stub): ciao_client_dnc { project(NodeAppTest_RoundTrip_svnt) : ciao_servant_dnc { after += NodeAppTest_RoundTrip_stub - requires += cidl sharedname = NodeAppTest_RoundTrip_svnt libs += NodeAppTest_RoundTrip_stub @@ -55,10 +54,10 @@ project(NodeAppTest_RoundTrip_exec) : ciao_component_dnc { } } -project (NodeAppTest_client_simple) : ciao_server_dnc, ciao_deployment_svnt { +project (NodeAppTest_client_simple) : ciao_server_dnc, ciao_deployment_stub { after += NodeAppTest_RoundTrip_exec - libs += NodeAppTest_RoundTrip_stub + libs += NodeAppTest_RoundTrip_stub exename += client_simple IDL_Files { @@ -69,7 +68,7 @@ project (NodeAppTest_client_simple) : ciao_server_dnc, ciao_deployment_svnt { } } -project (NodeAppTest_client) : ciao_server_dnc, ciao_deployment_svnt { +project (NodeAppTest_client) : ciao_server_dnc, ciao_deployment_stub { after += NodeAppTest_RoundTrip_exec libs += NodeAppTest_RoundTrip_stub exename += client @@ -83,9 +82,9 @@ project (NodeAppTest_client) : ciao_server_dnc, ciao_deployment_svnt { } } -project (NodeAppTest_client_ex) : ciao_server_dnc, ciao_deployment_svnt { +project (NodeAppTest_client_ex) : ciao_server_dnc, ciao_deployment_stub { after += NodeAppTest_RoundTrip_exec - libs += NodeAppTest_RoundTrip_stub + libs += NodeAppTest_RoundTrip_stub exename += client_ex IDL_Files { diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp index 4563835a2a0..48c585202d9 100644 --- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp +++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp @@ -119,8 +119,7 @@ RoundTrip_Impl::RoundTripHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) // Implementation for the probided inferface. CORBA::Long -RoundTrip_Impl::LatencyTest_Impl::cube_long (CORBA::Long data - ACE_ENV_ARG_DECL_NOT_USED) +RoundTrip_Impl::LatencyTest_Impl::cube_long (CORBA::Long data) ACE_THROW_SPEC ((CORBA::SystemException)) { return data*data*data; diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h index ce25a707580..132d52a2e30 100644 --- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h +++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h @@ -109,8 +109,7 @@ namespace RoundTrip_Impl { } - virtual CORBA::Long cube_long (CORBA::Long data - ACE_ENV_ARG_DECL) + virtual CORBA::Long cube_long (CORBA::Long data) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test.pl b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test.pl index dc8afc09a22..66bd2b1120f 100755 --- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test.pl +++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test.pl @@ -25,7 +25,7 @@ for ($iter = 0; $iter <= $#ARGV; $iter++) { unlink $iorfile; $CIAO_ROOT=$ENV{'CIAO_ROOT'}; -$SV = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeApplication/NodeApplication", +$SV = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeApplication/NodeApplication", "-n -o $iorfile"); $CL = new PerlACE::Process ("client", diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_ex.pl b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_ex.pl index ccb27eab392..1840175abde 100755 --- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_ex.pl +++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_ex.pl @@ -25,7 +25,7 @@ for ($iter = 0; $iter <= $#ARGV; $iter++) { unlink $iorfile; $CIAO_ROOT=$ENV{'CIAO_ROOT'}; -$SV = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeApplication/NodeApplication", +$SV = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeApplication/NodeApplication", "-n -o $iorfile"); $CL = new PerlACE::Process ("client_ex", diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_simple.pl b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_simple.pl index 0d0253e2b5d..26b7edf2c14 100755 --- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_simple.pl +++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_simple.pl @@ -25,7 +25,7 @@ for ($iter = 0; $iter <= $#ARGV; $iter++) { unlink $iorfile; $CIAO_ROOT=$ENV{'CIAO_ROOT'}; -$SV = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeApplication/NodeApplication", +$SV = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeApplication/NodeApplication", "-n -o $iorfile"); $CL = new PerlACE::Process ("client_simple", |