Tue Apr 27 00:03:16 1999 Irfan Pyarali <irfan@cs.wustl.edu>

2 files changed, 79 insertions, 21 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index 0791214a46f..ec9d0990345 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,3 +1,7 @@
+Tue Apr 27 00:03:16 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* tests/Collection_Test.cpp (main): Added test code for ACE_Array.
+
 Mon Apr 26 23:55:43 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 	* ace/Synch_T.h (class ACE_Reverse_Lock): Removed constructor that
diff --git a/tests/Collection_Test.cpp b/tests/Collection_Test.cpp
index bc1dc94f3b5..6001e17db6f 100644
--- a/tests/Collection_Test.cpp
+++ b/tests/Collection_Test.cpp
@@ -30,35 +30,85 @@ USELIB("..\ace\aced.lib");
 
 typedef int DATA;
 
-typedef ACE_Unbounded_Set<DATA> COLLECTION;
-typedef ACE_Unbounded_Set_Iterator<DATA> ITERATOR;
+typedef ACE_Unbounded_Set<DATA> UNBOUNDED_SET;
+typedef ACE_Unbounded_Set_Iterator<DATA> UNBOUNDED_SET_ITERATOR;
+typedef ACE_Array<DATA> ARRAY;
+typedef ACE_Array_Iterator<DATA> ARRAY_ITERATOR;
 
 int main (int, char *[])
 {
   ACE_START_TEST (ASYS_TEXT ("Collection_Test"));
 
-  COLLECTION collection;
+  {
+    UNBOUNDED_SET unbounded_set;
 
-  collection.insert (1);
-  collection.insert (2);
+    unbounded_set.insert (1);
+    unbounded_set.insert (2);
 
-  for (COLLECTION::iterator iterator1 = collection.begin ();
-       iterator1 != collection.end ();
-       iterator1++)
     {
-      ACE_DEBUG ((LM_DEBUG, "%d\n",
-                  (*iterator1)));
+      for (UNBOUNDED_SET::iterator iterator = unbounded_set.begin ();
+           iterator != unbounded_set.end ();
+           ++iterator)
+        {
+          ACE_DEBUG ((LM_DEBUG, "%d\n",
+                      (*iterator)));
+        }
     }
 
-  ITERATOR iterator2 (collection);
-  while (!iterator2.done ())
     {
-      int *data = 0;
-      iterator2.next (data);
-      ACE_DEBUG ((LM_DEBUG, "%d\n",
-                  (*data)));
-      iterator2.advance ();
+      UNBOUNDED_SET_ITERATOR iterator (unbounded_set);
+      while (!iterator.done ())
+        {
+          DATA *data = 0;
+          iterator.next (data);
+          ACE_DEBUG ((LM_DEBUG, "%d\n",
+                      (*data)));
+          iterator.advance ();
+        }
     }
+  }
+
+  {
+    ARRAY array1;
+    array1.size (2);
+    array1[0] = 4;
+    array1[1] = 4;
+
+    ARRAY array2 (2, 4);
+
+    ARRAY array3 (array2);
+
+    ARRAY array4;
+    array4 = array2;
+
+    ACE_ASSERT (array1 == array2);
+    ACE_ASSERT (array1 == array3);
+    ACE_ASSERT (array1 == array4);
+
+    {
+      for (size_t i = 0;
+           i != array1.size ();
+           ++i)
+        {
+          ACE_DEBUG ((LM_DEBUG, "%d\n",
+                      array1[i]));
+          ACE_ASSERT (array1[i] == 4);
+        }
+    }
+
+    {
+      ARRAY_ITERATOR iterator (array1);
+      while (!iterator.done ())
+        {
+          DATA *data = 0;
+          iterator.next (data);
+          ACE_DEBUG ((LM_DEBUG, "%d\n",
+                      (*data)));
+          ACE_ASSERT (*data == 4);
+          iterator.advance ();
+        }
+    }
+  }
 
   ACE_END_TEST;
 
@@ -67,11 +117,15 @@ int main (int, char *[])
 
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Unbounded_Set_Iterator<DATA>;
-template class ACE_Unbounded_Set<DATA>;
+template class UNBOUNDED_SET;
+template class UNBOUNDED_SET_ITERATOR;
 template class ACE_Node<DATA>;
+template class ARRAY;
+template class ARRAY_ITERATOR;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Unbounded_Set_Iterator<DATA>
-#pragma instantiate ACE_Unbounded_Set<DATA>
+#pragma instantiate UNBOUNDED_SET
+#pragma instantiate UNBOUNDED_SET_ITERATOR
 #pragma instantiate ACE_Node<DATA>
+#pragma instantiate ARRAY
+#pragma instantiate ARRAY_ITERATOR
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */