diff --git a/CMakeLists.txt b/CMakeLists.txt index 5bb0acd..6493f02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,5 +32,6 @@ 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_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_copy ./game_test_thperrier game_copy) \ No newline at end of file +add_test(test_thperrier_game_equal ./game_test_thperrier game_equal) \ No newline at end of file diff --git a/README.md b/README.md index 28a9030..4fe4b56 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Projet Techno | [game_new](./game_test_thoguet.c#L49) | [game game_new(square *squares)](./game.h#L73-81) | @thoguet | | | | [game_new_empty](./game_test_thperrier.c#L16) | [game game_new_empty(void)](./game.h#L83-88) | @thperrier | | | | [game_copy](./game_test_thperrier.c#L32) | [game game_copy(cgame g)](./game.h#L90-96) | @thperrier | | | -| [game_equal](./game_test_thperrier.c#L?) | [bool game_equal(cgame g1, cgame g2)](./game.h#L98-106) | @thperrier | | | +| [game_equal](./game_test_thperrier.c#L?) | [bool game_equal(cgame g1, cgame g2)](./game.h#L98-106) | @thperrier | | | | [game_delete](./game_test_thperrier.c#L?) | [void game_delete(game g);](./game.h#L108-113) | @thperrier | | | | [game_set_square](./game_test_nnunes.c#L?) | [void game_set_square(game g, uint i, uint j, square s)](./game.h#L115-128) | @nnunes | | | | [game_get_square](./game_test_thoguet.c#L89) | [square game_get_square(cgame g, uint i, uint j)](./game.h#L130-140) | @thoguet | | | diff --git a/game_test_thperrier.c b/game_test_thperrier.c index 81699fc..3ce74b5 100644 --- a/game_test_thperrier.c +++ b/game_test_thperrier.c @@ -12,13 +12,30 @@ bool test_dummy(){ return true; } +/* ********** game_equal ********** */ +bool test_game_equal(){ + bool equal = true; + game g1 = game_new_empty(); + game g2 = game_new_empty(); + for (int i = 0; i < DEFAULT_SIZE; i++){ + for (int j = 0; j < DEFAULT_SIZE; j++){ + if (game_get_square(g1, i, j) != game_get_square(g2, i, j)){ + game_delete(g1); + game_delete(g2); + equal = false; + } + } + } + return (equal == game_equal(g1, g2)); +} + /* ********** game_new_empty ********** */ bool test_game_new_empty(){ game g = game_new_empty(); assert(g); for (int i = 0; i < DEFAULT_SIZE; i++){ for (int j = 0; j < DEFAULT_SIZE; j++){ - if (game_get_flags(g, i, j) != S_BLANK){ + if (game_get_square(g, i, j) != S_BLANK){ game_delete(g); return false; } @@ -62,6 +79,9 @@ int main (int argc, char *argv[]){ else if (strcmp("game_copy", argv[1]) == 0){ success = test_game_copy(); } + else if (strcmp("game_equal", argv[1]) == 0){ + success = test_game_equal(); + } else{ fprintf (stderr, "test \"%s\" is not a valid test name.\n", argv[1]); return EXIT_FAILURE;