diff options
Diffstat (limited to 'tests/Collection_Test.cpp')
-rw-r--r-- | tests/Collection_Test.cpp | 105 |
1 files changed, 20 insertions, 85 deletions
diff --git a/tests/Collection_Test.cpp b/tests/Collection_Test.cpp index bdbd04c5ede..bc1dc94f3b5 100644 --- a/tests/Collection_Test.cpp +++ b/tests/Collection_Test.cpp @@ -30,94 +30,35 @@ USELIB("..\ace\aced.lib"); typedef int DATA; +typedef ACE_Unbounded_Set<DATA> COLLECTION; +typedef ACE_Unbounded_Set_Iterator<DATA> ITERATOR; + int main (int, char *[]) { ACE_START_TEST (ASYS_TEXT ("Collection_Test")); - typedef ACE_Unbounded_Set<DATA> UNBOUNDED_SET; - typedef ACE_Unbounded_Set_Iterator<DATA> UNBOUNDED_SET_ITERATOR; - - { - UNBOUNDED_SET unbounded_set; - - unbounded_set.insert (1); - unbounded_set.insert (2); - - { - for (UNBOUNDED_SET::iterator iterator = unbounded_set.begin (); - iterator != unbounded_set.end (); - ++iterator) - { - ACE_DEBUG ((LM_DEBUG, "%d\n", - (*iterator))); - } - } - - { - UNBOUNDED_SET_ITERATOR iterator (unbounded_set); - while (!iterator.done ()) - { - DATA *data = 0; - iterator.next (data); - ACE_DEBUG ((LM_DEBUG, "%d\n", - (*data))); - iterator.advance (); - } - } - } - - typedef ACE_Array<DATA> ARRAY; - typedef ACE_Array_Iterator<DATA> ARRAY_ITERATOR; + COLLECTION collection; - { - ARRAY array; - } - - { - ARRAY array (0); - } - - { - 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); + collection.insert (1); + collection.insert (2); + for (COLLECTION::iterator iterator1 = collection.begin (); + iterator1 != collection.end (); + iterator1++) { - for (size_t i = 0; - i != array1.size (); - ++i) - { - ACE_DEBUG ((LM_DEBUG, "%d\n", - array1[i])); - ACE_ASSERT (array1[i] == 4); - } + ACE_DEBUG ((LM_DEBUG, "%d\n", + (*iterator1))); } + ITERATOR iterator2 (collection); + while (!iterator2.done ()) { - 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 (); - } + int *data = 0; + iterator2.next (data); + ACE_DEBUG ((LM_DEBUG, "%d\n", + (*data))); + iterator2.advance (); } - } ACE_END_TEST; @@ -126,17 +67,11 @@ int main (int, char *[]) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Unbounded_Set<DATA>; template class ACE_Unbounded_Set_Iterator<DATA>; +template class ACE_Unbounded_Set<DATA>; template class ACE_Node<DATA>; -template class ACE_Array<DATA>; -template class ACE_Array_Base<DATA>; -template class ACE_Array_Iterator<DATA>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Unbounded_Set<DATA> #pragma instantiate ACE_Unbounded_Set_Iterator<DATA> +#pragma instantiate ACE_Unbounded_Set<DATA> #pragma instantiate ACE_Node<DATA> -#pragma instantiate ACE_Array<DATA> -#pragma instantiate ACE_Array_Base<DATA> -#pragma instantiate ACE_Array_Iterator<DATA> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |