Reorganized map2 unit test to reduce compiling time and memory

[libcds.git] / tests / unit / map2 / map_find_int.h

diff --git a/tests/unit/map2/map_find_int.h b/tests/unit/map2/map_find_int.h
index cc4c12eed9512d544dd04aa964306c4acb41b9ff..77bbb81d9f0409885438d64df387b971281f3fc6 100644 (file)
--- a/tests/unit/map2/map_find_int.h
+++ b/tests/unit/map2/map_find_int.h
@@ -2,7 +2,7 @@
 
 // defines concurrent access to map::nonconcurrent_iterator::Sequence::TValue::nAccess field
 
-#include "map2/map_types.h"
+#include "map2/map_type.h"
 #include "cppunit/thread.h"
 
 #include <vector>
@@ -11,10 +11,10 @@
 // find int test in map<int> in mutithreaded mode
 namespace map2 {
 
-#   define TEST_MAP(X)         void X() { test<MapTypes<key_type, value_type>::X >()    ; }
-#   define TEST_MAP_NOLF(X)    void X() { test_nolf<MapTypes<key_type, value_type>::X >()    ; }
-#   define TEST_MAP_EXTRACT(X)  TEST_MAP(X)
-#   define TEST_MAP_NOLF_EXTRACT(X) TEST_MAP_NOLF(X)
+#   define TEST_MAP(IMPL, C, X)         void C::X() { test<map_type<IMPL, key_type, value_type>::X >(); }
+#   define TEST_MAP_NOLF(IMPL, C, X)    void C::X() { test_nolf<map_type<IMPL, key_type, value_type>::X >(); }
+#   define TEST_MAP_EXTRACT(IMPL, C, X)  TEST_MAP(IMPL, C, X)
+#   define TEST_MAP_NOLF_EXTRACT(IMPL, C, X) TEST_MAP_NOLF(IMPL, C, X)
 
     class Map_find_int: public CppUnitMini::TestCase
     {