des/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Refactor to make a test

Browse source
This commit is contained in:
Patricia Aas 2020-11-27 18:21:19 +01:00
parent 303deb5940
commit 9814dc0b9b
18 changed files with 28 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pacman/CMakeLists.txt
View file

@ -1,2 +1,11 @@
include(${CMAKE_BINARY_DIR}/conan.cmake)
conan_add_remote(NAME bincrafters INDEX 1 URL https://api.bintray.com/conan/bincrafters/public-conan)
conan_cmake_run(CONANFILE conanfile.py BASIC_SETUP CMAKE_TARGETS BUILD missing)
add_subdirectory(lib)
add_subdirectory(src)
add_subdirectory(test)
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/assets/maze.png DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/bin)
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/assets/sprites32.png DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/bin)

0
pacman/src/Board.cpp → pacman/lib/Board.cpp
View file

0
pacman/src/Board.h → pacman/lib/Board.h
View file

7
pacman/lib/CMakeLists.txt Normal file
View file

@ -0,0 +1,7 @@
find_package(sdl2 REQUIRED)
find_package(sdl2_image REQUIRED)
include_directories(${sdl2_INCLUDE_DIRS} ${sdl2_image_INCLUDE_DIRS})
file(GLOB_RECURSE sources CONFIGURE_DEPENDS "*.cpp")
add_library(libpacman ${sources})
target_link_libraries(libpacman sdl2::sdl2 sdl2_image::sdl2_image)

0
pacman/src/Direction.h → pacman/lib/Direction.h
View file

0
pacman/src/Game.cpp → pacman/lib/Game.cpp
View file

0
pacman/src/Game.h → pacman/lib/Game.h
View file

0
pacman/src/GameWindow.cpp → pacman/lib/GameWindow.cpp
View file

0
pacman/src/GameWindow.h → pacman/lib/GameWindow.h
View file

0
pacman/src/InputState.cpp → pacman/lib/InputState.cpp
View file

0
pacman/src/InputState.h → pacman/lib/InputState.h
View file

0
pacman/src/PacMan.cpp → pacman/lib/PacMan.cpp
View file

0
pacman/src/PacMan.h → pacman/lib/PacMan.h
View file

0
pacman/src/Position.h → pacman/lib/Position.h
View file

15
pacman/src/CMakeLists.txt
View file

@ -1,15 +1,4 @@
include(${CMAKE_BINARY_DIR}/conan.cmake)
conan_add_remote(NAME bincrafters INDEX 1 URL https://api.bintray.com/conan/bincrafters/public-conan)
conan_cmake_run(CONANFILE ../conanfile.py BASIC_SETUP CMAKE_TARGETS BUILD missing)
find_package(sdl2 REQUIRED)
find_package(sdl2_image REQUIRED)
include_directories(${sdl2_INCLUDE_DIRS} ${sdl2_image_INCLUDE_DIRS})
file(GLOB_RECURSE sources CONFIGURE_DEPENDS "*.cpp")
add_executable(PacMan ${sources})
target_link_libraries(PacMan sdl2::sdl2 sdl2_image::sdl2_image)
add_executable(pacman ${sources})
target_link_libraries(pacman libpacman)
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/../assets/maze.png DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/bin)
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/../assets/sprites32.png DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/bin)

2
pacman/src/main.cpp
View file

@ -1,4 +1,4 @@
#include "Game.h"
#include "../lib/Game.h"
extern "C" int main([[maybe_unused]] int argc, [[maybe_unused]] char * argv[]) {
Game game;

6
pacman/test/CMakeLists.txt
View file

@ -4,8 +4,8 @@ find_package(GTest REQUIRED)
include(GoogleTest)
add_executable(tests tests.cpp)
target_link_libraries(tests GTest::GTest)
target_link_libraries(tests GTest::GTest libpacman)
gtest_add_tests(TARGET tests TEST_PREFIX old_pacman:)
gtest_discover_tests(tests TEST_PREFIX new_pacman:)
#gtest_add_tests(TARGET tests TEST_PREFIX old_pacman:)
gtest_discover_tests(tests TEST_PREFIX pacman:)
add_test(NAME monolithic COMMAND tests)

7
pacman/test/tests.cpp
View file

@ -1,7 +1,10 @@
#include <gtest/gtest.h>
#include "../lib/PacMan.h"
TEST(PacManTest, Allocate) {
EXPECT_EQ(0, 1);
TEST(PacManTest, InitialPosition) {
PacMan pacMan;
EXPECT_EQ(pacMan.currentPosition().x, 14);
EXPECT_EQ(pacMan.currentPosition().y, 23);
}
int main(int argc, char* argv[]) {