From 467e0274d6b31935c53a4d9d30aefdd3042d7c12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophyl?= Date: Fri, 11 Feb 2022 17:23:05 +0100 Subject: [PATCH] add tests v1 and tests v2 --- .gitlab-ci.yml | 16 +++++++++--- CMakeLists.txt | 70 +++++++++++++++++++++++++------------------------- 2 files changed, 48 insertions(+), 38 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 802168f..8e1355f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,12 +17,22 @@ build-job: # This job runs in the build stage, which runs first. paths: - build/ -make-test: # This job runs in the test stage. +test-v1-job: # This job runs in the test stage. allow_failure: false tags: - shell stage: test # It only starts when the job in the build stage completes successfully. script: - cd build - - echo "Running tests..." - - make test \ No newline at end of file + - echo "Running tests V1..." + - ctest -R v1 + +test-v2-job: # This job runs in the test stage. + allow_failure: false + tags: + - shell + stage: test # It only starts when the job in the build stage completes successfully. + script: + - cd build + - echo "Running tests V2..." + - ctest -R v2 \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index fac58cb..e52167f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ project (game_text) include(CTest) #positionne la variable -set(CMAKE_C_FLAGS "-std=c99 -g -Wall -Wextra -Wpedantic -Werror") +set(CMAKE_C_FLAGS "-std=c99 -g -Wall -Wextra -Wpedantic") #définit le nom du programme ainsi que #ses sources @@ -29,44 +29,44 @@ target_link_libraries(game_test_nnunes game) add_library (game game.c game_aux.c game_ext.c game_private.c history.c game_tools.c game_examples.c) #Tests THOGUET -add_test(test_thoguet_dummy ./game_test_thoguet dummy) -add_test(test_thoguet_game_new ./game_test_thoguet game_new) -add_test(test_thoguet_game_print ./game_test_thoguet game_print) -add_test(test_thoguet_game_get_square ./game_test_thoguet game_get_square) -add_test(test_thoguet_game_default ./game_test_thoguet game_default) -add_test(test_thoguet_game_default_solution ./game_test_thoguet game_default_solution) -add_test(test_thoguet_game_restart ./game_test_thoguet game_restart) -add_test(test_thoguet_game_is_over ./game_test_thoguet game_is_over) -add_test(test_thoguet_game_update_flags ./game_test_thoguet game_update_flags) -add_test(test_thoguet_game_play_move ./game_test_thoguet game_play_move) -add_test(test_thoguet_game_check_move ./game_test_thoguet game_check_move) -add_test(test_thoguet_game_new_empty_ext ./game_test_thoguet game_new_empty_ext) -add_test(test_thoguet_game_new_ext ./game_test_thoguet game_new_ext) +add_test(test_thoguet_dummy_v1 ./game_test_thoguet dummy) +add_test(test_thoguet_game_new_v1 ./game_test_thoguet game_new) +add_test(test_thoguet_game_print_v2 ./game_test_thoguet game_print) +add_test(test_thoguet_game_get_square_v2 ./game_test_thoguet game_get_square) +add_test(test_thoguet_game_default_v1 ./game_test_thoguet game_default) +add_test(test_thoguet_game_default_solution_v1 ./game_test_thoguet game_default_solution) +add_test(test_thoguet_game_restart_v2 ./game_test_thoguet game_restart) +add_test(test_thoguet_game_is_over_v1 ./game_test_thoguet game_is_over) +add_test(test_thoguet_game_update_flags_v2 ./game_test_thoguet game_update_flags) +add_test(test_thoguet_game_play_move_v2 ./game_test_thoguet game_play_move) +add_test(test_thoguet_game_check_move_v2 ./game_test_thoguet game_check_move) +add_test(test_thoguet_game_new_empty_ext_v2 ./game_test_thoguet game_new_empty_ext) +add_test(test_thoguet_game_new_ext_v2 ./game_test_thoguet game_new_ext) #Tests THPERRIER -add_test(test_thperrier_dummy ./game_test_thperrier dummy) -add_test(test_thperrier_game_copy ./game_test_thperrier game_copy) -add_test(test_thperrier_game_new_empty ./game_test_thperrier game_new_empty) -add_test(test_thperrier_game_equal ./game_test_thperrier game_equal) -add_test(test_thperrier_game_delete ./game_test_thperrier game_delete) -add_test(test_thperrier_game_is_blank ./game_test_thperrier game_is_blank) -add_test(test_thperrier_game_is_lightbulb ./game_test_thperrier game_is_lightbulb) -add_test(test_thperrier_game_is_black ./game_test_thperrier game_is_black) -add_test(test_thperrier_game_get_black_number ./game_test_thperrier game_get_black_number) -add_test(test_thperrier_game_undo ./game_test_thperrier game_undo) -add_test(test_thperrier_game_redo ./game_test_thperrier game_redo) +add_test(test_thperrier_dummy_v1 ./game_test_thperrier dummy) +add_test(test_thperrier_game_copy_v2 ./game_test_thperrier game_copy) +add_test(test_thperrier_game_new_empty_v1 ./game_test_thperrier game_new_empty) +add_test(test_thperrier_game_equal_v2 ./game_test_thperrier game_equal) +add_test(test_thperrier_game_delete_v2 ./game_test_thperrier game_delete) +add_test(test_thperrier_game_is_blank_v1 ./game_test_thperrier game_is_blank) +add_test(test_thperrier_game_is_lightbulb_v1 ./game_test_thperrier game_is_lightbulb) +add_test(test_thperrier_game_is_black_v1 ./game_test_thperrier game_is_black) +add_test(test_thperrier_game_get_black_number_v1 ./game_test_thperrier game_get_black_number) +add_test(test_thperrier_game_undo_v2 ./game_test_thperrier game_undo) +add_test(test_thperrier_game_redo_v2 ./game_test_thperrier game_redo) #Tests NNUNES -add_test(test_nnunes_dummy ./game_test_nnunes dummy) -add_test(test_nnunes_game_set_square ./game_test_nnunes game_set_square) -add_test(test_nnunes_game_get_state ./game_test_nnunes game_get_state) -add_test(test_nnunes_game_get_flags ./game_test_nnunes game_get_flags) -add_test(test_nnunes_game_is_marked ./game_test_nnunes game_is_marked) -add_test(test_nnunes_game_is_lighted ./game_test_nnunes game_is_lighted) -add_test(test_nnunes_game_has_error ./game_test_nnunes game_has_error) -add_test(test_nnunes_game_nb_rows ./game_test_nnunes game_nb_rows) -add_test(test_nnunes_game_nb_cols ./game_test_nnunes game_nb_cols) -add_test(test_nnunes_game_is_wrapping ./game_test_nnunes game_is_wrapping) +add_test(test_nnunes_dummy_v1 ./game_test_nnunes dummy) +add_test(test_nnunes_game_set_square_v1 ./game_test_nnunes game_set_square) +add_test(test_nnunes_game_get_state_v1 ./game_test_nnunes game_get_state) +add_test(test_nnunes_game_get_flags_v1 ./game_test_nnunes game_get_flags) +add_test(test_nnunes_game_is_marked_v1 ./game_test_nnunes game_is_marked) +add_test(test_nnunes_game_is_lighted_v1 ./game_test_nnunes game_is_lighted) +add_test(test_nnunes_game_has_error_v2 ./game_test_nnunes game_has_error) +add_test(test_nnunes_game_nb_rows_v2 ./game_test_nnunes game_nb_rows) +add_test(test_nnunes_game_nb_cols_v2 ./game_test_nnunes game_nb_cols) +add_test(test_nnunes_game_is_wrapping_v2 ./game_test_nnunes game_is_wrapping) #Tests HISTORY # add_test(test_history_history_alloc ./history_test history_alloc)