diff --git a/.gitignore b/.gitignore index 9bf3746..a51d839 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,6 @@ compile_commands.json +build/* +.directory +*.kdev4 +*.kate-swp +*.x diff --git a/CMakeLists.txt b/CMakeLists.txt index 49c25a8..a30faea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,16 +2,23 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.10) PROJECT(gtest) -FIND_PACKAGE(deal.II 9.2 REQUIRED +list(APPEND CMAKE_PREFIX_PATH "/home/Arrow/opt") + +FIND_PACKAGE(deal.II 9.2.0 REQUIRED HINTS ${deal.II_DIR} ${DEAL_II_DIR} ../ ../../ $ENV{DEAL_II_DIR}) DEAL_II_INITIALIZE_CACHED_VARIABLES() -ADD_EXECUTABLE(gtest pythagoras.cc) + + + +ADD_EXECUTABLE(gtest source/main.cc source/point_tests.cc) FIND_PACKAGE(GTest) TARGET_LINK_LIBRARIES(gtest ${GTEST_LIBRARY}) INCLUDE_DIRECTORIES(${GTEST_INCLUDE_DIRS}) ENABLE_TESTING() + + DEAL_II_SETUP_TARGET(gtest DEBUG) -GTEST_DISCOVER_TESTS(gtest) \ No newline at end of file +GTEST_DISCOVER_TESTS(gtest) diff --git a/source/main.cc b/source/main.cc new file mode 100644 index 0000000..09f29e8 --- /dev/null +++ b/source/main.cc @@ -0,0 +1,8 @@ +#include + + +int main(int argc, char *argv[]) +{ + testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} diff --git a/pythagoras.cc b/source/point_tests.cc similarity index 55% rename from pythagoras.cc rename to source/point_tests.cc index 10d7acd..8bc1a2c 100644 --- a/pythagoras.cc +++ b/source/point_tests.cc @@ -26,10 +26,24 @@ TEST(Pythagoras, ScalarProduct) ASSERT_EQ(x * x, 25); } +TEST(Pythagoras3, Norm) +{ + Point<3> x(20, 4, 5); + ASSERT_EQ(x.norm(), 21); +} + + +TEST(Pythagoras3, Distance) +{ + Point<3> x(21, 5, 6); + Point<3> y(1, 1, 1); + ASSERT_EQ(x.distance(y), 21); +} -int -main(int argc, char *argv[]) + +TEST(Pythagoras3, ScalarProduct) { - testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); + Point<3> x(20, 4, 5); + ASSERT_EQ(x * x, 441); } +