diff --git a/test/unittest/CMakeLists.txt b/test/unittest/CMakeLists.txt index 89adf72..692e686 100644 --- a/test/unittest/CMakeLists.txt +++ b/test/unittest/CMakeLists.txt @@ -18,13 +18,14 @@ else() add_compile_options(/W4 /permissive- /sdl) endif() +enable_testing() + add_subdirectory(googletest) include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR}) -include_directories(.) -enable_testing() include(GoogleTest) + +include_directories(.) include_directories(../../) -enable_testing() add_executable(BasicTest basic_test.cpp) target_link_libraries(BasicTest gtest gtest_main) diff --git a/test/unittest/googletest b/test/unittest/googletest index 5f8fcf4..703bd9c 160000 --- a/test/unittest/googletest +++ b/test/unittest/googletest @@ -1 +1 @@ -Subproject commit 5f8fcf4aa8ce30dfe76f9c9db97d2da4ce3737ef +Subproject commit 703bd9caab50b139428cea1aaff9974ebee5742e diff --git a/test/unittest/type_traits_test.cpp b/test/unittest/type_traits_test.cpp index aa4ca67..164cc79 100644 --- a/test/unittest/type_traits_test.cpp +++ b/test/unittest/type_traits_test.cpp @@ -21,6 +21,7 @@ static_assert(internal::is_signed_int::value, ""); static_assert(internal::is_signed_int::value, ""); static_assert(internal::is_signed_int::value, ""); +static_assert(!internal::is_signed_int::value, ""); static_assert(!internal::is_signed_int::value, ""); static_assert(!internal::is_signed_int::value, ""); static_assert(!internal::is_signed_int::value, ""); @@ -33,6 +34,7 @@ static_assert(!internal::is_unsigned_int::value, ""); static_assert(!internal::is_unsigned_int::value, ""); static_assert(!internal::is_unsigned_int::value, ""); +static_assert(internal::is_unsigned_int::value, ""); static_assert(internal::is_unsigned_int::value, ""); static_assert(internal::is_unsigned_int::value, ""); static_assert(internal::is_unsigned_int::value, ""); diff --git a/test/utils/math.hpp b/test/utils/math.hpp index 47cec4c..ae07545 100644 --- a/test/utils/math.hpp +++ b/test/utils/math.hpp @@ -1,5 +1,6 @@ -#include -#include +#include "atcoder/internal_math" +#include "atcoder/math" + #include std::vector factors(int m) {