From 05e9afc5cf97cc302990b11ebe49b31f79ccbf04 Mon Sep 17 00:00:00 2001 From: Thibault Perrier Date: Tue, 16 Nov 2021 17:28:19 +0100 Subject: [PATCH] ajout test_game_is_black + modif CMake & README --- CMakeLists.txt | 1 + README.md | 2 +- game_test_thperrier.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 240c095..dbf8e81 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,6 +43,7 @@ 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_nnunes_dummy ./game_test_thperrier dummy) add_test(test_nnunes_game_get_square ./game_test_nnunes game_get_square) diff --git a/README.md b/README.md index acd681f..0bf3e60 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Projet Techno | [game_get_flags](./game_test_nnunes.c#L?) | [square game_get_flags(cgame g, uint i, uint j)](./game.h#L155-166) | @nnunes | | | | [game_is_blank](./game_test_thperrier.c#L?) | [bool game_is_blank(cgame g, uint i, uint j)](./game.h#L168-178) | @thperrier | | | | [game_is_lightbulb](./game_test_thperrier.c#L?) | [bool game_is_lightbulb(cgame g, uint i, uint j)](./game.h#L180-190) | @thperrier | | | -| [game_is_black](./game_test_thperrier.c#L?) | [bool game_is_black(cgame g, uint i, uint j)](./game.h#L192-202) | @thperrier | | | +| [game_is_black](./game_test_thperrier.c#L?) | [bool game_is_black(cgame g, uint i, uint j)](./game.h#L192-202) | @thperrier | | | | [game_get_black_number](./game_test_thperrier.c#L?) | [int game_get_black_number(cgame g, uint i, uint j)](./game.h#L204-214) | @thperrier | | | | [game_is_marked](./game_test_nnunes.c#L?) | [bool game_is_marked(cgame g, uint i, uint j)](./game.h#L216-226) | @nnunes | | | | [game_is_lighted](./game_test_nnunes.c#L?) | [bool game_is_lighted(cgame g, uint i, uint j)](./game.h#L228-238) | @nnunes | | | diff --git a/game_test_thperrier.c b/game_test_thperrier.c index d2b35cf..7000739 100644 --- a/game_test_thperrier.c +++ b/game_test_thperrier.c @@ -12,6 +12,43 @@ bool test_dummy(){ return true; } +/* ********** game_is_black ********** */ +bool test_game_is_black(){ + game g = game_new_empty(); + game_set_square(g, 0, 0, S_BLACKU); + if (!(game_get_square(g, 0, 0) == S_BLACKU) && game_is_black(g, 0, 0)){ + game_delete(g); + return false; + } + game_set_square(g, 0, 0, S_BLACK0); + if (!(game_get_square(g, 0, 0) == S_BLACK0) && game_is_black(g, 0, 0)){ + game_delete(g); + return false; + } + game_set_square(g, 0, 0, S_BLACK1); + if (!(game_get_square(g, 0, 0) == S_BLACK1) && game_is_black(g, 0, 0)){ + game_delete(g); + return false; + } + game_set_square(g, 0, 0, S_BLACK2); + if (!(game_get_square(g, 0, 0) == S_BLACK2) && game_is_black(g, 0, 0)){ + game_delete(g); + return false; + } + game_set_square(g, 0, 0, S_BLACK3); + if (!(game_get_square(g, 0, 0) == S_BLACK3) && game_is_black(g, 0, 0)){ + game_delete(g); + return false; + } + game_set_square(g, 0, 0, S_BLACK4); + if (!(game_get_square(g, 0, 0) == S_BLACK4) && game_is_black(g, 0, 0)){ + game_delete(g); + return false; + } + game_delete(g); + return true; +} + /* ********** game_is_blank ********** */ bool test_game_is_lightbulb(){ game g = game_new_empty(); @@ -43,6 +80,7 @@ bool test_game_delete(){ if (game_equal(g1, g2)){ return false; } + g1 = NULL; return true; }