diff options
Diffstat (limited to 'test/unit/util')
-rw-r--r-- | test/unit/util/array_store_all_black.h | 2 | ||||
-rw-r--r-- | test/unit/util/assert_white.h | 2 | ||||
-rw-r--r-- | test/unit/util/boolean_simplification_black.h | 15 | ||||
-rw-r--r-- | test/unit/util/cardinality_public.h | 8 | ||||
-rw-r--r-- | test/unit/util/datatype_black.h | 3 | ||||
-rw-r--r-- | test/unit/util/exception_black.h | 2 | ||||
-rw-r--r-- | test/unit/util/integer_black.h | 3 | ||||
-rw-r--r-- | test/unit/util/output_black.h | 2 | ||||
-rw-r--r-- | test/unit/util/stats_black.h | 2 | ||||
-rw-r--r-- | test/unit/util/subrange_bound_white.h | 9 |
10 files changed, 23 insertions, 25 deletions
diff --git a/test/unit/util/array_store_all_black.h b/test/unit/util/array_store_all_black.h index 433dd7601..6a75bc7fa 100644 --- a/test/unit/util/array_store_all_black.h +++ b/test/unit/util/array_store_all_black.h @@ -16,7 +16,7 @@ #include <cxxtest/TestSuite.h> -#include "util/array_store_all.h" +#include "expr/array_store_all.h" #include "expr/expr_manager.h" #include "expr/expr_manager_scope.h" #include "expr/type.h" diff --git a/test/unit/util/assert_white.h b/test/unit/util/assert_white.h index 38dfe87e6..bbc4d02b3 100644 --- a/test/unit/util/assert_white.h +++ b/test/unit/util/assert_white.h @@ -19,7 +19,7 @@ #include <string> #include <cstring> -#include "util/cvc4_assert.h" +#include "base/cvc4_assert.h" using namespace CVC4; using namespace std; diff --git a/test/unit/util/boolean_simplification_black.h b/test/unit/util/boolean_simplification_black.h index db02ce207..ac343ede8 100644 --- a/test/unit/util/boolean_simplification_black.h +++ b/test/unit/util/boolean_simplification_black.h @@ -14,15 +14,15 @@ ** Black box testing of CVC4::BooleanSimplification. **/ -#include "util/language.h" -#include "expr/node.h" -#include "expr/kind.h" -#include "expr/node_manager.h" -#include "util/boolean_simplification.h" - #include <algorithm> -#include <vector> #include <set> +#include <vector> + +#include "expr/kind.h" +#include "expr/node.h" +#include "expr/node_manager.h" +#include "options/language.h" +#include "smt_util/boolean_simplification.h" using namespace CVC4; using namespace std; @@ -214,4 +214,3 @@ public: } };/* class BooleanSimplificationBlack */ - diff --git a/test/unit/util/cardinality_public.h b/test/unit/util/cardinality_public.h index 732bb0dbb..2fcee66b6 100644 --- a/test/unit/util/cardinality_public.h +++ b/test/unit/util/cardinality_public.h @@ -14,11 +14,11 @@ ** Public-box testing of CVC4::Cardinality. **/ -#include "util/cardinality.h" -#include "util/integer.h" - -#include <string> #include <sstream> +#include <string> + +#include "util/integer.h" +#include "util/cardinality.h" using namespace CVC4; using namespace std; diff --git a/test/unit/util/datatype_black.h b/test/unit/util/datatype_black.h index ff36336ca..91a53ddc3 100644 --- a/test/unit/util/datatype_black.h +++ b/test/unit/util/datatype_black.h @@ -17,8 +17,7 @@ #include <cxxtest/TestSuite.h> #include <sstream> -#include "util/datatype.h" - +#include "expr/datatype.h" #include "expr/expr.h" #include "expr/expr_manager.h" #include "expr/expr_manager_scope.h" diff --git a/test/unit/util/exception_black.h b/test/unit/util/exception_black.h index d2ae7d3e5..c2c7f83c0 100644 --- a/test/unit/util/exception_black.h +++ b/test/unit/util/exception_black.h @@ -19,7 +19,7 @@ #include <iostream> #include <sstream> -#include "util/exception.h" +#include "base/exception.h" using namespace CVC4; using namespace std; diff --git a/test/unit/util/integer_black.h b/test/unit/util/integer_black.h index 36de17cba..510afe7b7 100644 --- a/test/unit/util/integer_black.h +++ b/test/unit/util/integer_black.h @@ -15,8 +15,9 @@ **/ #include <cxxtest/TestSuite.h> -#include <sstream> + #include <limits> +#include <sstream> #include "util/integer.h" diff --git a/test/unit/util/output_black.h b/test/unit/util/output_black.h index 0b151ef3f..87423f026 100644 --- a/test/unit/util/output_black.h +++ b/test/unit/util/output_black.h @@ -19,7 +19,7 @@ #include <iostream> #include <sstream> -#include "util/output.h" +#include "base/output.h" using namespace CVC4; using namespace std; diff --git a/test/unit/util/stats_black.h b/test/unit/util/stats_black.h index 249f9a5b1..c0e1ea7fd 100644 --- a/test/unit/util/stats_black.h +++ b/test/unit/util/stats_black.h @@ -19,7 +19,7 @@ #include <string> #include <ctime> -#include "util/statistics_registry.h" +#include "expr/statistics_registry.h" using namespace CVC4; using namespace std; diff --git a/test/unit/util/subrange_bound_white.h b/test/unit/util/subrange_bound_white.h index 71947b297..3b785ae0d 100644 --- a/test/unit/util/subrange_bound_white.h +++ b/test/unit/util/subrange_bound_white.h @@ -14,11 +14,11 @@ ** White-box testing of CVC4::SubrangeBound. **/ -#include "util/subrange_bound.h" -#include "util/integer.h" - -#include <string> #include <sstream> +#include <string> + +#include "util/integer.h" +#include "util/subrange_bound.h" using namespace CVC4; using namespace std; @@ -72,4 +72,3 @@ public: } };/* class SubrangeBoundWhite */ - |