summaryrefslogtreecommitdiff
path: root/ACE/tests/Vector_Test.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ACE/tests/Vector_Test.cpp')
-rw-r--r--ACE/tests/Vector_Test.cpp52
1 files changed, 24 insertions, 28 deletions
diff --git a/ACE/tests/Vector_Test.cpp b/ACE/tests/Vector_Test.cpp
index ecfae68116b..581202129d7 100644
--- a/ACE/tests/Vector_Test.cpp
+++ b/ACE/tests/Vector_Test.cpp
@@ -1,25 +1,21 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-// tests
-//
-// = FILENAME
-// Vector_Test.cpp
-//
-// = DESCRIPTION
-// This is a simple test of the ACE_Vector class and its iterators.
-//
-// = AUTHOR
-// Gonzalo A. Diethelm <gonzalo.diethelm@aditiva.com> and
-// Karl-Heinz Wind <wind@itq.de>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ * @file Vector_Test.cpp
+ *
+ * $Id$
+ *
+ * This is a simple test of the ACE_Vector class and its iterators.
+ *
+ *
+ * @author Gonzalo A. Diethelm <gonzalo.diethelm@aditiva.com> and Karl-Heinz Wind <wind@itq.de>
+ */
+//=============================================================================
+
#include "test_config.h"
-ACE_RCSID(tests, Vector_Test, "$Id$")
+
#include "ace/Vector_T.h"
@@ -44,13 +40,13 @@ int run_main (int, ACE_TCHAR *[])
for (i = 0; i < TOP; ++i)
vector.push_back (i);
- ACE_ASSERT (vector.size () == TOP);
+ ACE_TEST_ASSERT (vector.size () == TOP);
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("Size: %d\n"),
vector.size ()));
for (i = 0; i < TOP; ++i)
- ACE_ASSERT (vector[i] == i);
+ ACE_TEST_ASSERT (vector[i] == i);
// Test to be sure the iterator gets the correct count and entries.
ITERATOR iter (vector);
@@ -74,14 +70,14 @@ int run_main (int, ACE_TCHAR *[])
for (i = 0; i < (TOP - LEFT); ++i)
vector.pop_back ();
- ACE_ASSERT (vector.size () == LEFT);
+ ACE_TEST_ASSERT (vector.size () == LEFT);
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("Size: %d\n"),
vector.size ()));
for (i = 0; i < LEFT; ++i)
{
- ACE_ASSERT (vector[i] == i);
+ ACE_TEST_ASSERT (vector[i] == i);
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("vector[%d]:%d\n"),
i, vector[i]));
@@ -97,11 +93,11 @@ int run_main (int, ACE_TCHAR *[])
// second argument of the resize() call.
if (i < LEFT)
{
- ACE_ASSERT (vector[i] == i);
+ ACE_TEST_ASSERT (vector[i] == i);
}
else
{
- ACE_ASSERT (vector[i] == 0);
+ ACE_TEST_ASSERT (vector[i] == 0);
}
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("vector[%d]:%d\n"),
@@ -109,7 +105,7 @@ int run_main (int, ACE_TCHAR *[])
}
vector.clear ();
- ACE_ASSERT (vector.size () == 0);
+ ACE_TEST_ASSERT (vector.size () == 0);
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("Size: %d\n"),
vector.size ()));
@@ -141,9 +137,9 @@ int run_main (int, ACE_TCHAR *[])
vector2.push_back (FILLER2);
// now we check the result
- ACE_ASSERT (vector2[0] == FILLER1);
+ ACE_TEST_ASSERT (vector2[0] == FILLER1);
for (i = 0; i < boundary; ++i)
- ACE_ASSERT (vector2[i+1] == FILLER2);
+ ACE_TEST_ASSERT (vector2[i+1] == FILLER2);
VECTOR v1;
VECTOR v2;