maride/tty-solitaire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #21 from greno4ka/workontests

Browse Source 
Work on tests
This commit is contained in:
Murilo Pereira 2018-05-07 13:36:15 +02:00 committed by GitHub
commit ed25d56aa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/game_test.c
View File

@ -129,6 +129,7 @@ void test_valid_move_from_waste_pile_to_foundation_stacks() {
card_set(foundation_stacks[2]->card, ACE, SPADES, EXPOSED, FOUNDATION_BEGIN_Y, FOUNDATION_2_BEGIN_X); card_set(foundation_stacks[2]->card, ACE, SPADES, EXPOSED, FOUNDATION_BEGIN_Y, FOUNDATION_2_BEGIN_X);
card_set(foundation_stacks[3]->card, ACE, SPADES, EXPOSED, FOUNDATION_BEGIN_Y, FOUNDATION_3_BEGIN_X); card_set(foundation_stacks[3]->card, ACE, SPADES, EXPOSED, FOUNDATION_BEGIN_Y, FOUNDATION_3_BEGIN_X);
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
// TODO: fix error here
assert(valid_move(waste_pile, foundation_stacks[i])); assert(valid_move(waste_pile, foundation_stacks[i]));
} }
stack_free(waste_pile); stack_free(waste_pile);
@ -155,6 +156,7 @@ void test_valid_move_from_waste_pile_to_maneuvre_stacks() {
card_set(maneuvre_stacks[5]->card, ACE, SPADES, EXPOSED, MANEUVRE_BEGIN_Y, MANEUVRE_5_BEGIN_X); card_set(maneuvre_stacks[5]->card, ACE, SPADES, EXPOSED, MANEUVRE_BEGIN_Y, MANEUVRE_5_BEGIN_X);
card_set(maneuvre_stacks[6]->card, ACE, SPADES, EXPOSED, MANEUVRE_BEGIN_Y, MANEUVRE_6_BEGIN_X); card_set(maneuvre_stacks[6]->card, ACE, SPADES, EXPOSED, MANEUVRE_BEGIN_Y, MANEUVRE_6_BEGIN_X);
for (int i = 0; i < 7; i++) { for (int i = 0; i < 7; i++) {
// TODO: fix error here
assert(valid_move(waste_pile, maneuvre_stacks[i])); assert(valid_move(waste_pile, maneuvre_stacks[i]));
} }
stack_free(waste_pile); stack_free(waste_pile);
@ -225,6 +227,7 @@ void test_valid_move_from_foundation_stack_to_foundation_stacks() {
if (i == j) { if (i == j) {
assert(!valid_move(foundation_stacks[i], foundation_stacks[j])); assert(!valid_move(foundation_stacks[i], foundation_stacks[j]));
} else { } else {
// TODO: fix error here
assert(valid_move(foundation_stacks[i], foundation_stacks[j])); assert(valid_move(foundation_stacks[i], foundation_stacks[j]));
} }
} }
@ -259,6 +262,7 @@ void test_valid_move_from_foundation_stack_to_maneuvre_stacks() {
card_set(maneuvre_stacks[6]->card, ACE, SPADES, EXPOSED, MANEUVRE_BEGIN_Y, MANEUVRE_6_BEGIN_X); card_set(maneuvre_stacks[6]->card, ACE, SPADES, EXPOSED, MANEUVRE_BEGIN_Y, MANEUVRE_6_BEGIN_X);
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
for (int j = 0; j < 7; j++) { for (int j = 0; j < 7; j++) {
// TODO: fix error here
assert(valid_move(foundation_stacks[i], maneuvre_stacks[j])); assert(valid_move(foundation_stacks[i], maneuvre_stacks[j]));
} }
} }
@ -347,6 +351,7 @@ void test_valid_move_from_maneuvre_stack_to_foundation_stacks() {
card_set(maneuvre_stacks[6]->card, ACE, SPADES, EXPOSED, MANEUVRE_BEGIN_Y, MANEUVRE_6_BEGIN_X); card_set(maneuvre_stacks[6]->card, ACE, SPADES, EXPOSED, MANEUVRE_BEGIN_Y, MANEUVRE_6_BEGIN_X);
for (int i = 0; i < 7; i++) { for (int i = 0; i < 7; i++) {
for (int j = 0; j < 4; j++) { for (int j = 0; j < 4; j++) {
// TODO: fix error here
assert(valid_move(maneuvre_stacks[i], foundation_stacks[j])); assert(valid_move(maneuvre_stacks[i], foundation_stacks[j]));
} }
} }
@ -377,6 +382,7 @@ void test_valid_move_from_maneuvre_stack_to_maneuvre_stacks() {
if (i == j) { if (i == j) {
assert(!valid_move(maneuvre_stacks[i], maneuvre_stacks[j])); assert(!valid_move(maneuvre_stacks[i], maneuvre_stacks[j]));
} else { } else {
// TODO: fix error here
assert(valid_move(maneuvre_stacks[i], maneuvre_stacks[j])); assert(valid_move(maneuvre_stacks[i], maneuvre_stacks[j]));
} }
} }

4
tests/stack_test.c
View File

@ -217,7 +217,7 @@ void test_stack_reverse_on_stack_empty_stack() {
old_stack = stack; old_stack = stack;
stack_reversed_stack = stack_reverse(stack); stack_reversed_stack = stack_reverse(stack);
assert(stack_reversed_stack == old_stack); assert(stacks_equal(stack_reversed_stack, old_stack));
stack_free(stack); stack_free(stack);
} }
@ -236,7 +236,7 @@ void test_stack_reverse_on_stack_with_one_element() {
old_stack = stack; old_stack = stack;
stack_reversed_stack = stack_reverse(stack); stack_reversed_stack = stack_reverse(stack);
assert(stack_reversed_stack == old_stack); assert(stacks_equal(stack_reversed_stack, old_stack));
stack_free(stack); stack_free(stack);
} }