diff options
Diffstat (limited to 'tests/Env_Value_Test.cpp')
| -rw-r--r-- | tests/Env_Value_Test.cpp | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/tests/Env_Value_Test.cpp b/tests/Env_Value_Test.cpp index da467ad1ba8..82e08b524fe 100644 --- a/tests/Env_Value_Test.cpp +++ b/tests/Env_Value_Test.cpp @@ -26,7 +26,7 @@ do { \ ACE_Env_Value<type> val (varname, (defval)); \ if (val != (expval)) { \ ACE_ERROR ((LM_ERROR, \ - ASYS_TEXT ("val %d does not match expected value of %d\n"), \ + ACE_TEXT ("val %d does not match expected value of %d\n"), \ (int) (type) val, (int) (expval))); \ } \ ACE_ASSERT (val == (expval)); \ @@ -36,13 +36,15 @@ int #if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) || defined (ACE_LACKS_FORK) // ACE_HAS_NONSTATIC_OBJECT_MANAGER only allows main to have two // arguments. And on platforms that lack fork (), we can't use spawn. -main (int argc, ASYS_TCHAR* []) + +main (int argc, ACE_TCHAR* []) { ACE_UNUSED_ARG (argc); - ACE_OS::putenv (ASYS_TEXT ("TEST_VALUE_POSITIVE=10.2")); - ACE_OS::putenv (ASYS_TEXT ("TEST_VALUE_NEGATIVE=-10.2")); + + ACE_OS::putenv (ACE_TEXT ("TEST_VALUE_POSITIVE=10.2")); + ACE_OS::putenv (ACE_TEXT ("TEST_VALUE_NEGATIVE=-10.2")); #else /* ! ACE_HAS_NONSTATIC_OBJECT_MANAGER && ! ACE_LACKS_FORK */ -main (int argc, LPTSTR [], LPTSTR envp[]) +main (int argc, ACE_TCHAR * [], ACE_TCHAR *envp[]) { if (argc == 1) { @@ -74,28 +76,29 @@ main (int argc, LPTSTR [], LPTSTR envp[]) #endif /* ! ACE_HAS_NONSTATIC_OBJECT_MANAGER && ! ACE_LACKS_FORK */ { // In this case we're the child - ACE_START_TEST (ASYS_TEXT ("Env_Value_Test")); - TEST_THIS (int, ASYS_TEXT ("TEST_VALUE_POSITIVE"), 4, 10); + ACE_START_TEST (ACE_TEXT ("Env_Value_Test")); + + TEST_THIS (int, ACE_TEXT ("TEST_VALUE_POSITIVE"), 4, 10); #if !defined (ACE_LACKS_FLOATING_POINT) - TEST_THIS (double, ASYS_TEXT ("TEST_VALUE_POSITIVE"), -1.0, 10.2); + TEST_THIS (double, ACE_TEXT ("TEST_VALUE_POSITIVE"), -1.0, 10.2); #endif /* ! ACE_LACKS_FLOATING_POINT */ - TEST_THIS (long, ASYS_TEXT ("TEST_VALUE_POSITIVE"), 0, 10); - TEST_THIS (unsigned long, ASYS_TEXT ("TEST_VALUE_POSITIVE"), 0, 10); - TEST_THIS (short, ASYS_TEXT ("TEST_VALUE_POSITIVE"), 0, 10); - TEST_THIS (unsigned short, ASYS_TEXT ("TEST_VALUE_POSITIVE"), 0, 10); + TEST_THIS (long, ACE_TEXT ("TEST_VALUE_POSITIVE"), 0, 10); + TEST_THIS (unsigned long, ACE_TEXT ("TEST_VALUE_POSITIVE"), 0, 10); + TEST_THIS (short, ACE_TEXT ("TEST_VALUE_POSITIVE"), 0, 10); + TEST_THIS (unsigned short, ACE_TEXT ("TEST_VALUE_POSITIVE"), 0, 10); - TEST_THIS (int, ASYS_TEXT ("TEST_VALUE_NEGATIVE"), 4, -10); + TEST_THIS (int, ACE_TEXT ("TEST_VALUE_NEGATIVE"), 4, -10); #if !defined (ACE_LACKS_FLOATING_POINT) - TEST_THIS (double, ASYS_TEXT ("TEST_VALUE_NEGATIVE"), -1.0, -10.2); + TEST_THIS (double, ACE_TEXT ("TEST_VALUE_NEGATIVE"), -1.0, -10.2); #endif /* ! ACE_LACKS_FLOATING_POINT */ - TEST_THIS (long, ASYS_TEXT ("TEST_VALUE_NEGATIVE"), 0, -10L); - TEST_THIS (unsigned long, ASYS_TEXT ("TEST_VALUE_NEGATIVE"), 0, (unsigned long) -10); - TEST_THIS (short, ASYS_TEXT ("TEST_VALUE_NEGATIVE"), 0, -10); - TEST_THIS (unsigned short, ASYS_TEXT ("TEST_VALUE_NEGATIVE"), 0, (unsigned short) -10); + TEST_THIS (long, ACE_TEXT ("TEST_VALUE_NEGATIVE"), 0, -10L); + TEST_THIS (unsigned long, ACE_TEXT ("TEST_VALUE_NEGATIVE"), 0, (unsigned long) -10); + TEST_THIS (short, ACE_TEXT ("TEST_VALUE_NEGATIVE"), 0, -10); + TEST_THIS (unsigned short, ACE_TEXT ("TEST_VALUE_NEGATIVE"), 0, (unsigned short) -10); - const ASYS_TCHAR *defstr = ASYS_TEXT ("Sarah Cleeland is Two!"); - ACE_Env_Value<const ASYS_TCHAR *> sval (ASYS_TEXT ("This_Shouldnt_Be_Set_Hopefully"), + const ACE_TCHAR *defstr = ACE_TEXT ("Sarah Cleeland is Two!"); + ACE_Env_Value<const ACE_TCHAR *> sval (ACE_TEXT ("This_Shouldnt_Be_Set_Hopefully"), defstr); ACE_ASSERT (ACE_OS::strcmp (sval, defstr) == 0); ACE_END_TEST; |