Skip to content

Commit

Permalink
Reduce instantiation explosion in tests reducing combinations, so tha…
Browse files Browse the repository at this point in the history 
…t regression testing is manageable in time
  • Loading branch information
@igaztanaga
igaztanaga committed May 4, 2023
1 parent cc05ac6 commit f2afafa
Show file tree
Hide file tree
Showing 12 changed files with 62 additions and 203 deletions.
22 changes: 5 additions & 17 deletions test/avl_multiset_test.cpp
View file
Expand Up @@ -128,29 +128,17 @@ int main()

//void pointer
test_main_template<void*, false, false, false, Base>::execute();
//test_main_template<void*, false, false, true>::execute();
test_main_template<void*, false, true, false, Member>::execute();
//test_main_template<void*, false, true, true>::execute();
test_main_template<void*, true, false, false, Base>::execute();
//test_main_template<void*, true, false, true>::execute();
test_main_template<void*, true, true, false, Member>::execute();
test_main_template<void*, true, true, true, NonMember>::execute();
test_main_template<void*, true, false, false, Base>::execute();
test_main_template<void*, true, true, true, NonMember>::execute();

//smart_ptr
//test_main_template<smart_ptr<void>, false, false, false>::execute();
test_main_template<smart_ptr<void>, false, false, true, Base>::execute();
//test_main_template<smart_ptr<void>, false, true, false>::execute();
test_main_template<smart_ptr<void>, false, true, true, Member>::execute();
//test_main_template<smart_ptr<void>, true, false, false>::execute();
test_main_template<smart_ptr<void>, true, false, true, NonMember>::execute();
//test_main_template<smart_ptr<void>, true, true, false>::execute();
//test_main_template<smart_ptr<void>, true, true, true>::execute();
test_main_template<smart_ptr<void>, false, false, true, Base>::execute();
test_main_template<smart_ptr<void>, 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();
}
22 changes: 5 additions & 17 deletions test/avl_set_test.cpp
View file
Expand Up @@ -128,29 +128,17 @@ int main()

//void pointer
test_main_template<void*, false, false, false, Base>::execute();
//test_main_template<void*, false, false, true>::execute();
test_main_template<void*, false, true, false, Member>::execute();
//test_main_template<void*, false, true, true>::execute();
test_main_template<void*, true, false, false, Base>::execute();
//test_main_template<void*, true, false, true>::execute();
test_main_template<void*, true, true, false, Member>::execute();
test_main_template<void*, true, true, true, NonMember>::execute();
test_main_template<void*, true, false, false, Base>::execute();
test_main_template<void*, true, true, true, NonMember>::execute();

//smart_ptr
//test_main_template<smart_ptr<void>, false, false, false>::execute();
test_main_template<smart_ptr<void>, false, false, true, Base>::execute();
//test_main_template<smart_ptr<void>, false, true, false>::execute();
test_main_template<smart_ptr<void>, false, true, true, Member>::execute();
//test_main_template<smart_ptr<void>, true, false, false>::execute();
test_main_template<smart_ptr<void>, true, false, true, NonMember>::execute();
//test_main_template<smart_ptr<void>, true, true, false>::execute();
//test_main_template<smart_ptr<void>, true, true, true>::execute();
test_main_template<smart_ptr<void>, false, false, true, Base>::execute();
test_main_template<smart_ptr<void>, 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();
}
23 changes: 5 additions & 18 deletions test/bs_multiset_test.cpp
View file
Expand Up @@ -128,30 +128,17 @@ int main()

//void pointer
test_main_template<void*, false, false, false, Base>::execute();
//test_main_template<void*, false, false, true>::execute();
test_main_template<void*, false, true, false, Member>::execute();
//test_main_template<void*, false, true, true>::execute();
test_main_template<void*, true, false, false, Base>::execute();
//test_main_template<void*, true, false, true>::execute();
test_main_template<void*, true, true, false, Member>::execute();
test_main_template<void*, true, true, true, NonMember>::execute();
test_main_template<void*, true, false, false, Base>::execute();
test_main_template<void*, true, true, true, NonMember>::execute();

//smart_ptr
//test_main_template<smart_ptr<void>, false, false, false>::execute();
test_main_template<smart_ptr<void>, false, false, true, Base>::execute();
//test_main_template<smart_ptr<void>, false, true, false>::execute();
test_main_template<smart_ptr<void>, false, true, true, Member>::execute();
//test_main_template<smart_ptr<void>, true, false, false>::execute();
test_main_template<smart_ptr<void>, true, false, true, NonMember>::execute();
//test_main_template<smart_ptr<void>, true, true, false>::execute();
//test_main_template<smart_ptr<void>, true, true, true>::execute();
test_main_template<smart_ptr<void>, false, false, true, Base>::execute();
test_main_template<smart_ptr<void>, 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();
}
23 changes: 5 additions & 18 deletions test/bs_set_test.cpp
View file
Expand Up @@ -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<void*, false, false, false, Base>::execute();
//test_main_template<void*, false, false, true>::execute();
test_main_template<void*, false, true, false, Member>::execute();
//test_main_template<void*, false, true, true>::execute();
test_main_template<void*, true, false, false, Base>::execute();
//test_main_template<void*, true, false, true>::execute();
test_main_template<void*, true, true, false, Member>::execute();
test_main_template<void*, true, true, true, NonMember>::execute();
test_main_template<void*, true, false, false, Base>::execute();
test_main_template<void*, true, true, true, NonMember>::execute();

//smart_ptr
//test_main_template<smart_ptr<void>, false, false, false>::execute();
test_main_template<smart_ptr<void>, false, false, true, Base>::execute();
//test_main_template<smart_ptr<void>, false, true, false>::execute();
test_main_template<smart_ptr<void>, false, true, true, Member>::execute();
//test_main_template<smart_ptr<void>, true, false, false>::execute();
test_main_template<smart_ptr<void>, true, false, true, NonMember>::execute();
//test_main_template<smart_ptr<void>, true, true, false>::execute();
//test_main_template<smart_ptr<void>, true, true, true>::execute();
test_main_template<smart_ptr<void>, false, false, true, Base>::execute();
test_main_template<smart_ptr<void>, 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();
}
24 changes: 6 additions & 18 deletions test/multiset_test.cpp
View file
Expand Up @@ -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<void*, false, false, false, Base>::execute();
//test_main_template<void*, false, false, true>::execute();
test_main_template<void*, false, true, false, Member>::execute();
//test_main_template<void*, false, true, true>::execute();
test_main_template<void*, true, false, false, Base>::execute();
//test_main_template<void*, true, false, true>::execute();
test_main_template<void*, true, true, false, Member>::execute();
test_main_template<void*, true, true, true, NonMember>::execute();
test_main_template<void*, true, false, false, Base>::execute();
test_main_template<void*, true, true, true, NonMember>::execute();

//smart_ptr
//test_main_template<smart_ptr<void>, false, false, false>::execute();
test_main_template<smart_ptr<void>, false, false, true, Base>::execute();
//test_main_template<smart_ptr<void>, false, true, false>::execute();
test_main_template<smart_ptr<void>, false, true, true, Member>::execute();
//test_main_template<smart_ptr<void>, true, false, false>::execute();
test_main_template<smart_ptr<void>, true, false, true, NonMember>::execute();
//test_main_template<smart_ptr<void>, true, true, false>::execute();
//test_main_template<smart_ptr<void>, true, true, true>::execute();
test_main_template<smart_ptr<void>, false, false, true, Base>::execute();
test_main_template<smart_ptr<void>, 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();
}
13 changes: 0 additions & 13 deletions test/set_test.cpp
View file
Expand Up @@ -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<void*, false, false, false, Base>::execute();
//test_main_template<void*, false, false, true>::execute();
test_main_template<void*, false, true, false, Member>::execute();
//test_main_template<void*, false, true, true>::execute();
test_main_template<void*, true, false, false, Base>::execute();
//test_main_template<void*, true, false, true>::execute();
test_main_template<void*, true, true, false, Member>::execute();
test_main_template<void*, true, true, true, NonMember>::execute();

//smart_ptr
//test_main_template<smart_ptr<void>, false, false, false>::execute();
test_main_template<smart_ptr<void>, false, false, true, Base>::execute();
//test_main_template<smart_ptr<void>, false, true, false>::execute();
test_main_template<smart_ptr<void>, false, true, true, Member>::execute();
//test_main_template<smart_ptr<void>, true, false, false>::execute();
test_main_template<smart_ptr<void>, true, false, true, NonMember>::execute();
//test_main_template<smart_ptr<void>, true, true, false>::execute();
//test_main_template<smart_ptr<void>, 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();
Expand Down
22 changes: 5 additions & 17 deletions test/splay_multiset_test.cpp
View file
Expand Up @@ -127,29 +127,17 @@ int main()

//void pointer
test_main_template<void*, false, false, false, Base>::execute();
//test_main_template<void*, false, false, true>::execute();
test_main_template<void*, false, true, false, Member>::execute();
//test_main_template<void*, false, true, true>::execute();
test_main_template<void*, true, false, false, Base>::execute();
//test_main_template<void*, true, false, true>::execute();
test_main_template<void*, true, true, false, Member>::execute();
test_main_template<void*, true, true, true, NonMember>::execute();
test_main_template<void*, true, false, false, Base>::execute();
test_main_template<void*, true, true, true, NonMember>::execute();

//smart_ptr
//test_main_template<smart_ptr<void>, false, false, false>::execute();
test_main_template<smart_ptr<void>, false, false, true, Base>::execute();
//test_main_template<smart_ptr<void>, false, true, false>::execute();
test_main_template<smart_ptr<void>, false, true, true, Member>::execute();
//test_main_template<smart_ptr<void>, true, false, false>::execute();
test_main_template<smart_ptr<void>, true, false, true, NonMember>::execute();
//test_main_template<smart_ptr<void>, true, true, false>::execute();
//test_main_template<smart_ptr<void>, true, true, true>::execute();
test_main_template<smart_ptr<void>, false, false, true, Base>::execute();
test_main_template<smart_ptr<void>, 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();
}
23 changes: 5 additions & 18 deletions test/splay_set_test.cpp
View file
Expand Up @@ -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<void*, false, false, false, Base>::execute();
//test_main_template<void*, false, false, true>::execute();
test_main_template<void*, false, true, false, Member>::execute();
//test_main_template<void*, false, true, true>::execute();
test_main_template<void*, true, false, false, Base>::execute();
//test_main_template<void*, true, false, true>::execute();
test_main_template<void*, true, true, false, Member>::execute();
test_main_template<void*, true, true, true, NonMember>::execute();
test_main_template<void*, true, false, false, Base>::execute();
test_main_template<void*, true, true, true, NonMember>::execute();

//smart_ptr
//test_main_template<smart_ptr<void>, false, false, false>::execute();
test_main_template<smart_ptr<void>, false, false, true, Base>::execute();
//test_main_template<smart_ptr<void>, false, true, false>::execute();
test_main_template<smart_ptr<void>, false, true, true, Member>::execute();
//test_main_template<smart_ptr<void>, true, false, false>::execute();
test_main_template<smart_ptr<void>, true, false, true, NonMember>::execute();
//test_main_template<smart_ptr<void>, true, true, false>::execute();
//test_main_template<smart_ptr<void>, true, true, true>::execute();
test_main_template<smart_ptr<void>, false, false, true, Base>::execute();
test_main_template<smart_ptr<void>, 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();
}
22 changes: 5 additions & 17 deletions test/treap_multiset_test.cpp
View file
Expand Up @@ -129,29 +129,17 @@ int main()

//void pointer
test_main_template<void*, false, false, false, Base>::execute();
//test_main_template<void*, false, false, true>::execute();
test_main_template<void*, false, true, false, Member>::execute();
//test_main_template<void*, false, true, true>::execute();
test_main_template<void*, true, false, false, Base>::execute();
//test_main_template<void*, true, false, true>::execute();
test_main_template<void*, true, true, false, Member>::execute();
test_main_template<void*, true, true, true, NonMember>::execute();
test_main_template<void*, true, false, false, Base>::execute();
test_main_template<void*, true, true, true, NonMember>::execute();

//smart_ptr
//test_main_template<smart_ptr<void>, false, false, false>::execute();
test_main_template<smart_ptr<void>, false, false, true, Base>::execute();
//test_main_template<smart_ptr<void>, false, true, false>::execute();
test_main_template<smart_ptr<void>, false, true, true, Member>::execute();
//test_main_template<smart_ptr<void>, true, false, false>::execute();
test_main_template<smart_ptr<void>, true, false, true, NonMember>::execute();
//test_main_template<smart_ptr<void>, true, true, false>::execute();
//test_main_template<smart_ptr<void>, true, true, true>::execute();
test_main_template<smart_ptr<void>, false, false, true, Base>::execute();
test_main_template<smart_ptr<void>, 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();
}
22 changes: 5 additions & 17 deletions test/treap_set_test.cpp
View file
Expand Up @@ -128,29 +128,17 @@ int main()

//void pointer
test_main_template<void*, false, false, false, Base>::execute();
//test_main_template<void*, false, false, true>::execute();
test_main_template<void*, false, true, false, Member>::execute();
//test_main_template<void*, false, true, true>::execute();
test_main_template<void*, true, false, false, Base>::execute();
//test_main_template<void*, true, false, true>::execute();
test_main_template<void*, true, true, false, Member>::execute();
test_main_template<void*, true, true, true, NonMember>::execute();
test_main_template<void*, true, false, false, Base>::execute();
test_main_template<void*, true, true, true, NonMember>::execute();

//smart_ptr
//test_main_template<smart_ptr<void>, false, false, false>::execute();
test_main_template<smart_ptr<void>, false, false, true, Base>::execute();
//test_main_template<smart_ptr<void>, false, true, false>::execute();
test_main_template<smart_ptr<void>, false, true, true, Member>::execute();
//test_main_template<smart_ptr<void>, true, false, false>::execute();
test_main_template<smart_ptr<void>, true, false, true, NonMember>::execute();
//test_main_template<smart_ptr<void>, true, true, false>::execute();
//test_main_template<smart_ptr<void>, true, true, true>::execute();
test_main_template<smart_ptr<void>, false, false, true, Base>::execute();
test_main_template<smart_ptr<void>, 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();
}

0 comments on commit f2afafa

Please sign in to comment.