diff --git a/unit/analyses/call_graph.cpp b/unit/analyses/call_graph.cpp index d14127e7af3..753809ac924 100644 --- a/unit/analyses/call_graph.cpp +++ b/unit/analyses/call_graph.cpp @@ -8,40 +8,17 @@ Module: Unit test for call graph generation #include +#include #include #include #include #include -#include #include -static symbolt create_void_function_symbol( - const irep_idt &name, - const codet &code) -{ - const code_typet void_function_type({}, empty_typet()); - symbolt function; - function.name=name; - function.type=void_function_type; - function.mode=ID_java; - function.value=code; - return function; -} -static bool multimap_key_matches( - const std::multimap &map, - const irep_idt &key, - const std::set &values) -{ - auto matching_values=map.equal_range(key); - std::set matching_set; - for(auto it=matching_values.first; it!=matching_values.second; ++it) - matching_set.insert(it->second); - return matching_set==values; -} SCENARIO("call_graph", "[core][util][call_graph]") diff --git a/unit/analyses/dependence_graph.cpp b/unit/analyses/dependence_graph.cpp index be82c2700c5..2ccfb017773 100644 --- a/unit/analyses/dependence_graph.cpp +++ b/unit/analyses/dependence_graph.cpp @@ -8,28 +8,16 @@ Author: Chris Smowton, chris.smowton@diffblue.com #include -#include #include -#include -#include -#include -#include +#include #include #include -#include - -static symbolt create_void_function_symbol( - const irep_idt &name, - const codet &code) -{ - const code_typet void_function_type({}, empty_typet()); - symbolt function; - function.name = name; - function.type = void_function_type; - function.mode = ID_java; - function.value = code; - return function; -} +#include +#include +#include +#include +#include +#include const std::set& dependence_graph_test_get_control_deps(const dep_graph_domaint &domain) diff --git a/unit/analyses/disconnect_unreachable_nodes_in_graph.cpp b/unit/analyses/disconnect_unreachable_nodes_in_graph.cpp index 84d26f106c5..729832393c1 100644 --- a/unit/analyses/disconnect_unreachable_nodes_in_graph.cpp +++ b/unit/analyses/disconnect_unreachable_nodes_in_graph.cpp @@ -8,40 +8,15 @@ Module: Unit test for graph class functions #include +#include #include -#include #include -#include #include #include -static symbolt -create_void_function_symbol(const irep_idt &name, const codet &code) -{ - const code_typet void_function_type({}, empty_typet()); - symbolt function; - function.name = name; - function.type = void_function_type; - function.mode = ID_java; - function.value = code; - return function; -} - -static bool multimap_key_matches( - const std::multimap &map, - const irep_idt &key, - const std::set &values) -{ - auto matching_values = map.equal_range(key); - std::set matching_set; - for(auto it = matching_values.first; it != matching_values.second; ++it) - matching_set.insert(it->second); - return matching_set == values; -} - SCENARIO("graph", "[core][util][graph]") { GIVEN("Some cyclic function calls") diff --git a/unit/testing-utils/Makefile b/unit/testing-utils/Makefile index fd87bf78a33..5725b6dd518 100644 --- a/unit/testing-utils/Makefile +++ b/unit/testing-utils/Makefile @@ -1,4 +1,5 @@ SRC = \ + call_graph_test_utils.cpp \ free_form_cmdline.cpp \ message.cpp \ require_expr.cpp \ diff --git a/unit/testing-utils/call_graph_test_utils.cpp b/unit/testing-utils/call_graph_test_utils.cpp new file mode 100644 index 00000000000..28ace366ba4 --- /dev/null +++ b/unit/testing-utils/call_graph_test_utils.cpp @@ -0,0 +1,33 @@ +/*******************************************************************\ + +Module: Call graph test utils + +Author: Chris Smowton, chris.smowton@diffblue.com + +\*******************************************************************/ + +#include "call_graph_test_utils.h" + +symbolt +create_void_function_symbol(const irep_idt &name, const codet &code) +{ + const code_typet void_function_type({}, empty_typet()); + symbolt function; + function.name = name; + function.type = void_function_type; + function.mode = ID_java; + function.value = code; + return function; +} + +bool multimap_key_matches( + const std::multimap &map, + const irep_idt &key, + const std::set &values) +{ + auto matching_values = map.equal_range(key); + std::set matching_set; + for(auto it = matching_values.first; it != matching_values.second; ++it) + matching_set.insert(it->second); + return matching_set == values; +} diff --git a/unit/testing-utils/call_graph_test_utils.h b/unit/testing-utils/call_graph_test_utils.h new file mode 100644 index 00000000000..34f71a55896 --- /dev/null +++ b/unit/testing-utils/call_graph_test_utils.h @@ -0,0 +1,24 @@ +/*******************************************************************\ + +Module: Call graph test utils + +Author: Chris Smowton, chris.smowton@diffblue.com + +\*******************************************************************/ + +#ifndef CPROVER_TESTING_UTILS_CALL_GRAPH_TEST_UTILS_H +#define CPROVER_TESTING_UTILS_CALL_GRAPH_TEST_UTILS_H + +#include + +#include + +symbolt +create_void_function_symbol(const irep_idt &name, const codet &code); + +bool multimap_key_matches( + const std::multimap &map, + const irep_idt &key, + const std::set &values); + +#endif /* CPROVER_TESTING_UTILS_CALL_GRAPH_TEST_UTILS_HT */ diff --git a/unit/testing-utils/module_dependencies.txt b/unit/testing-utils/module_dependencies.txt index b5ccfdd0368..dc09d4d3f95 100644 --- a/unit/testing-utils/module_dependencies.txt +++ b/unit/testing-utils/module_dependencies.txt @@ -1,3 +1,4 @@ ansi-c testing-utils util +analyses