From f2afafa6bb9a9caea5af458ed8d75fd09fab009c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Thu, 4 May 2023 18:19:24 +0200 Subject: [PATCH] Reduce instantiation explosion in tests reducing combinations, so that regression testing is manageable in time --- test/avl_multiset_test.cpp | 22 +++++----------------- test/avl_set_test.cpp | 22 +++++----------------- test/bs_multiset_test.cpp | 23 +++++------------------ test/bs_set_test.cpp | 23 +++++------------------ test/multiset_test.cpp | 24 ++++++------------------ test/set_test.cpp | 13 ------------- test/splay_multiset_test.cpp | 22 +++++----------------- test/splay_set_test.cpp | 23 +++++------------------ test/treap_multiset_test.cpp | 22 +++++----------------- test/treap_set_test.cpp | 22 +++++----------------- test/unordered_multiset_test.cpp | 23 +++++++---------------- test/unordered_set_test.cpp | 26 +++++++++----------------- 12 files changed, 62 insertions(+), 203 deletions(-) diff --git a/test/avl_multiset_test.cpp b/test/avl_multiset_test.cpp index c2dce57..753795a 100644 --- a/test/avl_multiset_test.cpp +++ b/test/avl_multiset_test.cpp @@ -128,29 +128,17 @@ int main() //void pointer test_main_template::execute(); - //test_main_template::execute(); test_main_template::execute(); - //test_main_template::execute(); - test_main_template::execute(); - //test_main_template::execute(); - test_main_template::execute(); - test_main_template::execute(); + test_main_template::execute(); + test_main_template::execute(); //smart_ptr - //test_main_template, false, false, false>::execute(); - test_main_template, false, false, true, Base>::execute(); - //test_main_template, false, true, false>::execute(); - test_main_template, false, true, true, Member>::execute(); - //test_main_template, true, false, false>::execute(); - test_main_template, true, false, true, NonMember>::execute(); - //test_main_template, true, true, false>::execute(); - //test_main_template, true, true, true>::execute(); + test_main_template, false, false, true, Base>::execute(); + test_main_template, false, true, true, Member>::execute(); //bounded_ptr (bool ConstantTimeSize, bool Map) test_main_template_bptr< false, false >::execute(); - //test_main_template_bptr< false, true >::execute(); - //test_main_template_bptr< true, false >::execute(); - test_main_template_bptr< true, true >::execute(); + test_main_template_bptr< true, true >::execute(); return boost::report_errors(); } diff --git a/test/avl_set_test.cpp b/test/avl_set_test.cpp index 677232b..eb4cb51 100644 --- a/test/avl_set_test.cpp +++ b/test/avl_set_test.cpp @@ -128,29 +128,17 @@ int main() //void pointer test_main_template::execute(); - //test_main_template::execute(); test_main_template::execute(); - //test_main_template::execute(); - test_main_template::execute(); - //test_main_template::execute(); - test_main_template::execute(); - test_main_template::execute(); + test_main_template::execute(); + test_main_template::execute(); //smart_ptr - //test_main_template, false, false, false>::execute(); - test_main_template, false, false, true, Base>::execute(); - //test_main_template, false, true, false>::execute(); - test_main_template, false, true, true, Member>::execute(); - //test_main_template, true, false, false>::execute(); - test_main_template, true, false, true, NonMember>::execute(); - //test_main_template, true, true, false>::execute(); - //test_main_template, true, true, true>::execute(); + test_main_template, false, false, true, Base>::execute(); + test_main_template, false, true, true, Member>::execute(); //bounded_ptr (bool ConstantTimeSize, bool Map) test_main_template_bptr< false, false >::execute(); - //test_main_template_bptr< false, true >::execute(); - //test_main_template_bptr< true, false >::execute(); - test_main_template_bptr< true, true >::execute(); + test_main_template_bptr< true, true >::execute(); return boost::report_errors(); } diff --git a/test/bs_multiset_test.cpp b/test/bs_multiset_test.cpp index beb9115..0713eb9 100644 --- a/test/bs_multiset_test.cpp +++ b/test/bs_multiset_test.cpp @@ -128,30 +128,17 @@ int main() //void pointer test_main_template::execute(); - //test_main_template::execute(); test_main_template::execute(); - //test_main_template::execute(); - test_main_template::execute(); - //test_main_template::execute(); - test_main_template::execute(); - test_main_template::execute(); + test_main_template::execute(); + test_main_template::execute(); //smart_ptr - //test_main_template, false, false, false>::execute(); - test_main_template, false, false, true, Base>::execute(); - //test_main_template, false, true, false>::execute(); - test_main_template, false, true, true, Member>::execute(); - //test_main_template, true, false, false>::execute(); - test_main_template, true, false, true, NonMember>::execute(); - //test_main_template, true, true, false>::execute(); - //test_main_template, true, true, true>::execute(); + test_main_template, false, false, true, Base>::execute(); + test_main_template, false, true, true, Member>::execute(); //bounded_ptr (bool ConstantTimeSize, bool Map) test_main_template_bptr< false, false >::execute(); - //test_main_template_bptr< false, true >::execute(); - //test_main_template_bptr< true, false >::execute(); - test_main_template_bptr< true, true >::execute(); - //test_main_template_bptr< true, true >::execute(); + test_main_template_bptr< true, true >::execute(); return boost::report_errors(); } diff --git a/test/bs_set_test.cpp b/test/bs_set_test.cpp index d2f4f4f..e30022f 100644 --- a/test/bs_set_test.cpp +++ b/test/bs_set_test.cpp @@ -123,33 +123,20 @@ int main() { //Combinations: VoidPointer x ConstantTimeSize x DefaultHolder x Map //Minimize them selecting different combinations for raw and smart pointers - //Start with ('false', 'false', 'false') in sets and 'false', 'false', 'true' in multisets //void pointer test_main_template::execute(); - //test_main_template::execute(); test_main_template::execute(); - //test_main_template::execute(); - test_main_template::execute(); - //test_main_template::execute(); - test_main_template::execute(); - test_main_template::execute(); + test_main_template::execute(); + test_main_template::execute(); //smart_ptr - //test_main_template, false, false, false>::execute(); - test_main_template, false, false, true, Base>::execute(); - //test_main_template, false, true, false>::execute(); - test_main_template, false, true, true, Member>::execute(); - //test_main_template, true, false, false>::execute(); - test_main_template, true, false, true, NonMember>::execute(); - //test_main_template, true, true, false>::execute(); - //test_main_template, true, true, true>::execute(); + test_main_template, false, false, true, Base>::execute(); + test_main_template, false, true, true, Member>::execute(); //bounded_ptr (bool ConstantTimeSize, bool Map) test_main_template_bptr< false, false >::execute(); - //test_main_template_bptr< false, true >::execute(); - //test_main_template_bptr< true, false >::execute(); - test_main_template_bptr< true, true >::execute(); + test_main_template_bptr< true, true >::execute(); return boost::report_errors(); } diff --git a/test/multiset_test.cpp b/test/multiset_test.cpp index a8ab674..9677a4b 100644 --- a/test/multiset_test.cpp +++ b/test/multiset_test.cpp @@ -123,33 +123,21 @@ int main() { //Combinations: VoidPointer x ConstantTimeSize x DefaultHolder x Map //Minimize them selecting different combinations for raw and smart pointers - //Start with ('false', 'false', 'false') in sets and 'false', 'false', 'true' in multisets //void pointer test_main_template::execute(); - //test_main_template::execute(); test_main_template::execute(); - //test_main_template::execute(); - test_main_template::execute(); - //test_main_template::execute(); - test_main_template::execute(); - test_main_template::execute(); + test_main_template::execute(); + test_main_template::execute(); //smart_ptr - //test_main_template, false, false, false>::execute(); - test_main_template, false, false, true, Base>::execute(); - //test_main_template, false, true, false>::execute(); - test_main_template, false, true, true, Member>::execute(); - //test_main_template, true, false, false>::execute(); - test_main_template, true, false, true, NonMember>::execute(); - //test_main_template, true, true, false>::execute(); - //test_main_template, true, true, true>::execute(); + test_main_template, false, false, true, Base>::execute(); + test_main_template, false, true, true, Member>::execute(); //bounded_ptr (bool ConstantTimeSize, bool Map) test_main_template_bptr< false, false >::execute(); - //test_main_template_bptr< false, true >::execute(); - //test_main_template_bptr< true, false >::execute(); - test_main_template_bptr< true, true >::execute(); + test_main_template_bptr< true, true >::execute(); + return boost::report_errors(); } diff --git a/test/set_test.cpp b/test/set_test.cpp index e72575b..179e3e1 100644 --- a/test/set_test.cpp +++ b/test/set_test.cpp @@ -124,32 +124,19 @@ int main() { //Combinations: VoidPointer x ConstantTimeSize x DefaultHolder x Map //Minimize them selecting different combinations for raw and smart pointers - //Start with ('false', 'false', 'false') in sets and 'false', 'false', 'true' in multisets //void pointer test_main_template::execute(); - //test_main_template::execute(); test_main_template::execute(); - //test_main_template::execute(); test_main_template::execute(); - //test_main_template::execute(); - test_main_template::execute(); test_main_template::execute(); //smart_ptr - //test_main_template, false, false, false>::execute(); test_main_template, false, false, true, Base>::execute(); - //test_main_template, false, true, false>::execute(); test_main_template, false, true, true, Member>::execute(); - //test_main_template, true, false, false>::execute(); - test_main_template, true, false, true, NonMember>::execute(); - //test_main_template, true, true, false>::execute(); - //test_main_template, true, true, true>::execute(); //bounded_ptr (bool ConstantTimeSize, bool Map) test_main_template_bptr< false, false >::execute(); - //test_main_template_bptr< false, true >::execute(); - //test_main_template_bptr< true, false >::execute(); test_main_template_bptr< true, true >::execute(); return boost::report_errors(); diff --git a/test/splay_multiset_test.cpp b/test/splay_multiset_test.cpp index 70fb891..e3809a6 100644 --- a/test/splay_multiset_test.cpp +++ b/test/splay_multiset_test.cpp @@ -127,29 +127,17 @@ int main() //void pointer test_main_template::execute(); - //test_main_template::execute(); test_main_template::execute(); - //test_main_template::execute(); - test_main_template::execute(); - //test_main_template::execute(); - test_main_template::execute(); - test_main_template::execute(); + test_main_template::execute(); + test_main_template::execute(); //smart_ptr - //test_main_template, false, false, false>::execute(); - test_main_template, false, false, true, Base>::execute(); - //test_main_template, false, true, false>::execute(); - test_main_template, false, true, true, Member>::execute(); - //test_main_template, true, false, false>::execute(); - test_main_template, true, false, true, NonMember>::execute(); - //test_main_template, true, true, false>::execute(); - //test_main_template, true, true, true>::execute(); + test_main_template, false, false, true, Base>::execute(); + test_main_template, false, true, true, Member>::execute(); //bounded_ptr (bool ConstantTimeSize, bool Map) test_main_template_bptr< false, false >::execute(); - //test_main_template_bptr< false, true >::execute(); - //test_main_template_bptr< true, false >::execute(); - test_main_template_bptr< true, true >::execute(); + test_main_template_bptr< true, true >::execute(); return boost::report_errors(); } diff --git a/test/splay_set_test.cpp b/test/splay_set_test.cpp index 7aa73b2..3020e2e 100644 --- a/test/splay_set_test.cpp +++ b/test/splay_set_test.cpp @@ -123,33 +123,20 @@ int main() { //Combinations: VoidPointer x ConstantTimeSize x DefaultHolder x Map //Minimize them selecting different combinations for raw and smart pointers - //Start with ('false', 'false', 'false') in sets and 'false', 'false', 'true' in multisets //void pointer test_main_template::execute(); - //test_main_template::execute(); test_main_template::execute(); - //test_main_template::execute(); - test_main_template::execute(); - //test_main_template::execute(); - test_main_template::execute(); - test_main_template::execute(); + test_main_template::execute(); + test_main_template::execute(); //smart_ptr - //test_main_template, false, false, false>::execute(); - test_main_template, false, false, true, Base>::execute(); - //test_main_template, false, true, false>::execute(); - test_main_template, false, true, true, Member>::execute(); - //test_main_template, true, false, false>::execute(); - test_main_template, true, false, true, NonMember>::execute(); - //test_main_template, true, true, false>::execute(); - //test_main_template, true, true, true>::execute(); + test_main_template, false, false, true, Base>::execute(); + test_main_template, false, true, true, Member>::execute(); //bounded_ptr (bool ConstantTimeSize, bool Map) test_main_template_bptr< false, false >::execute(); - //test_main_template_bptr< false, true >::execute(); - //test_main_template_bptr< true, false >::execute(); - test_main_template_bptr< true, true >::execute(); + test_main_template_bptr< true, true >::execute(); return boost::report_errors(); } diff --git a/test/treap_multiset_test.cpp b/test/treap_multiset_test.cpp index 79d6e49..0fc4ff4 100644 --- a/test/treap_multiset_test.cpp +++ b/test/treap_multiset_test.cpp @@ -129,29 +129,17 @@ int main() //void pointer test_main_template::execute(); - //test_main_template::execute(); test_main_template::execute(); - //test_main_template::execute(); - test_main_template::execute(); - //test_main_template::execute(); - test_main_template::execute(); - test_main_template::execute(); + test_main_template::execute(); + test_main_template::execute(); //smart_ptr - //test_main_template, false, false, false>::execute(); - test_main_template, false, false, true, Base>::execute(); - //test_main_template, false, true, false>::execute(); - test_main_template, false, true, true, Member>::execute(); - //test_main_template, true, false, false>::execute(); - test_main_template, true, false, true, NonMember>::execute(); - //test_main_template, true, true, false>::execute(); - //test_main_template, true, true, true>::execute(); + test_main_template, false, false, true, Base>::execute(); + test_main_template, false, true, true, Member>::execute(); //bounded_ptr (bool ConstantTimeSize, bool Map) test_main_template_bptr< false, false >::execute(); - //test_main_template_bptr< false, true >::execute(); - //test_main_template_bptr< true, false >::execute(); - test_main_template_bptr< true, true >::execute(); + test_main_template_bptr< true, true >::execute(); return boost::report_errors(); } diff --git a/test/treap_set_test.cpp b/test/treap_set_test.cpp index f798777..10767b4 100644 --- a/test/treap_set_test.cpp +++ b/test/treap_set_test.cpp @@ -128,29 +128,17 @@ int main() //void pointer test_main_template::execute(); - //test_main_template::execute(); test_main_template::execute(); - //test_main_template::execute(); - test_main_template::execute(); - //test_main_template::execute(); - test_main_template::execute(); - test_main_template::execute(); + test_main_template::execute(); + test_main_template::execute(); //smart_ptr - //test_main_template, false, false, false>::execute(); - test_main_template, false, false, true, Base>::execute(); - //test_main_template, false, true, false>::execute(); - test_main_template, false, true, true, Member>::execute(); - //test_main_template, true, false, false>::execute(); - test_main_template, true, false, true, NonMember>::execute(); - //test_main_template, true, true, false>::execute(); - //test_main_template, true, true, true>::execute(); + test_main_template, false, false, true, Base>::execute(); + test_main_template, false, true, true, Member>::execute(); //bounded_ptr (bool ConstantTimeSize, bool Map) test_main_template_bptr< false, false >::execute(); - //test_main_template_bptr< false, true >::execute(); - //test_main_template_bptr< true, false >::execute(); - test_main_template_bptr< true, true >::execute(); + test_main_template_bptr< true, true >::execute(); return boost::report_errors(); } diff --git a/test/unordered_multiset_test.cpp b/test/unordered_multiset_test.cpp index 6521fd7..0cd274e 100644 --- a/test/unordered_multiset_test.cpp +++ b/test/unordered_multiset_test.cpp @@ -157,25 +157,16 @@ int main() //void pointer test_main_template::execute(); - test_main_template::execute(); - test_main_template::execute(); - test_main_template::execute(); - test_main_template::execute(); - test_main_template::execute(); - test_main_template::execute(); - test_main_template::execute(); - test_main_template::execute(); + test_main_template::execute(); + test_main_template::execute(); + test_main_template::execute(); + test_main_template::execute(); + test_main_template::execute(); //smart_ptr test_main_template, false, false, false, Member, false>::execute(); - test_main_template, false, true, false, NonMember, false>::execute(); - test_main_template, true, false, false, Base, false>::execute(); - test_main_template, true, true, false, Member, false>::execute(); - test_main_template, true, true, false, Base, true>::execute(); - - test_main_template, false, false, false, Member, true>::execute(); - test_main_template, false, true, false, NonMember, true>::execute(); - test_main_template, true, false, false, Base, true>::execute(); + test_main_template, false, true, true, NonMember, false>::execute(); + test_main_template, true, true, true, Base, true>::execute(); ////bounded_ptr (bool ConstantTimeSize, bool Map) //test_main_template_bptr< false, false >::execute(); diff --git a/test/unordered_set_test.cpp b/test/unordered_set_test.cpp index 7694144..baface0 100644 --- a/test/unordered_set_test.cpp +++ b/test/unordered_set_test.cpp @@ -149,25 +149,17 @@ int main() //VoidPointer x ConstantTimeSize x Map x DefaultHolder //void pointer - test_main_template::execute(); - test_main_template::execute(); - test_main_template::execute(); - test_main_template::execute(); - - test_main_template::execute(); - test_main_template::execute(); - test_main_template::execute(); - test_main_template::execute(); + test_main_template::execute(); + test_main_template::execute(); + test_main_template::execute(); + test_main_template::execute(); + test_main_template::execute(); + test_main_template::execute(); //smart_ptr - test_main_template, false, false, false, Member, false>::execute(); - test_main_template, false, true, false, NonMember, false>::execute(); - test_main_template, true, false, false, Base, false>::execute(); - test_main_template, true, true, false, Member, false>::execute(); - - test_main_template, false, false, false, Member, true>::execute(); - test_main_template, false, true, false, NonMember, true>::execute(); - test_main_template, true, false, false, Base, true>::execute(); + test_main_template, true, true, true, Member, true>::execute(); + test_main_template, true, false, false, NonMember, true>::execute(); + test_main_template, false, false, false, Base, false>::execute(); ////bounded_ptr (bool ConstantTimeSize, bool Map) //test_main_template_bptr< false, false >::execute();