diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-10-02 12:58:32 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-10-02 12:58:32 +0000 |
| commit | b0a8244935a3c2bc12159e58462ec3fadff087ab (patch) | |
| tree | 90bc38c28fe5ebaa2670b9b10b8fa38559bc9675 | |
| parent | 351c1137878c1cc1d224ecec5abcf398b5e3e0f1 (diff) | |
| download | ATCD-b0a8244935a3c2bc12159e58462ec3fadff087ab.tar.gz | |
Mon Oct 2 12:58:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp index 1a4e7bd323a..349ad507854 100644 --- a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp +++ b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp @@ -31,13 +31,13 @@ int fail = 0; int pretest = 0; int verbose = 0; -#define VERIFY(Condition) \ +#define VERIFY_CONDITION(Condition) \ { \ if (!(Condition)) \ { \ fail++; \ if (!verbose) \ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) - Failure at line %l\n"))); \ + ACE_ERROR ((LM_ERROR, ACE_TEXT("(%P|%t) - Failure at line %l\n"))); \ } \ } @@ -106,7 +106,7 @@ main (int argc, char **argv) PortableServer::POAManagerFactory_var poa_manager_factory = root_poa->the_POAManagerFactory (); - VERIFY (!CORBA::is_nil(poa_manager_factory.in())); + VERIFY_CONDITION (!CORBA::is_nil(poa_manager_factory.in())); if (verbose) ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("%s\n"), (pretest == fail) ? ACE_TEXT ("passed") : ACE_TEXT ("failed"))); @@ -128,7 +128,7 @@ main (int argc, char **argv) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - VERIFY (!CORBA::is_nil(poa_manager_1.in())); + VERIFY_CONDITION (!CORBA::is_nil(poa_manager_1.in())); if (verbose) ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("%s\n"), (pretest == fail) ? ACE_TEXT ("passed") : ACE_TEXT ("failed"))); @@ -155,7 +155,7 @@ main (int argc, char **argv) } ACE_ENDTRY; - VERIFY (got_expected_exception); + VERIFY_CONDITION (got_expected_exception); if (verbose) ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("%s\n"), (pretest == fail) ? ACE_TEXT ("passed") : ACE_TEXT ("failed"))); @@ -180,7 +180,7 @@ main (int argc, char **argv) = child_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - VERIFY (!CORBA::is_nil(poa_manager_2.in())); + VERIFY_CONDITION (!CORBA::is_nil(poa_manager_2.in())); if (verbose) ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("%s\n"), (pretest == fail) ? ACE_TEXT ("passed") : ACE_TEXT ("failed"))); @@ -207,7 +207,7 @@ main (int argc, char **argv) = poa_manager_factory->list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - VERIFY (managers->length () == 3); + VERIFY_CONDITION (managers->length () == 3); if (verbose) ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("%s\n"), (pretest == fail) ? ACE_TEXT ("passed") : ACE_TEXT ("failed"))); @@ -261,7 +261,7 @@ main (int argc, char **argv) CORBA::String_var name = manager->get_id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - VERIFY ((ACE_OS::strcmp (name.in (), "POAManager1") == 0 + VERIFY_CONDITION ((ACE_OS::strcmp (name.in (), "POAManager1") == 0 && manager.in () == poa_manager_1.in ())); if (verbose) |