hofmannjo99187/DobleSpiel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: hofmannjo99187:82b2fb283f850221a404a4b97a812ec4d87c0dfd
Branches Tags
hofmannjo99187:master
hofmannjo99187:branchjonas
hofmannjo99187:branchjens
..
compare: hofmannjo99187:2368c9f3b9750a32591af020445e8c71f8878111
Branches Tags
hofmannjo99187:master
hofmannjo99187:branchjonas
hofmannjo99187:branchjens

No commits in common. "82b2fb283f850221a404a4b97a812ec4d87c0dfd" and "2368c9f3b9750a32591af020445e8c71f8878111" have entirely different histories.
82b2fb283f ... 2368c9f3b9

2 changed files with 50 additions and 48 deletions
Show Stats Expand all files Collapse all files

11
makefile
View File

@ -38,17 +38,18 @@ $(program_obj_filesobj_files): %.o: %.c
# unitTests: # unitTests:
# echo "needs to be implemented" # echo "needs to be implemented"
stack: stack.c
$(CC) $(FLAGS) -c stack stack.c
test_stack: stack.o test_stack.c $(unityfolder)/unity.c
$(CC) $(FLAGS) -o runstackTests test_stack.c stack.o $(unityfolder)/unity.c
bintree: bintree.c bintree: bintree.c
$(CC) $(FLAGS) -c bintree bintree.c $(CC) $(FLAGS) -c bintree bintree.c
bintreeTests: bintree.o bintreeTests.c $(unityfolder)/unity.c bintreeTests: bintree.o bintreeTests.c $(unityfolder)/unity.c
$(CC) $(FLAGS) -o runbintreeTests bintreeTests.c bintree.o $(unityfolder)/unity.c $(CC) $(FLAGS) -o runbintreeTests bintreeTests.c bintree.o $(unityfolder)/unity.c
stack: stack.c
$(CC) $(FLAGS) -c stack stack.c
test_stack: stack.o test_stack.c $(unityfolder)/unity.c
$(CC) $(FLAGS) -o runstackTests test_stack.c stack.o $(unityfolder)/unity.c
# -------------------------- # --------------------------
# Clean # Clean
# -------------------------- # --------------------------

87
test_stack.c
View File

@ -1,30 +1,24 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "unity.h"
#include "stack.h" #include "stack.h"
void setUp(void) {
// Falls notwendig, kann hier Vorbereitungsarbeit gemacht werden
}
void tearDown(void) {
// Hier kann Bereinigungsarbeit nach jedem Test durchgeführt werden
}
void testeStackBeschreiben() void testeStackBeschreiben()
{ {
//printf("=== Test: push() ===\n"); printf("=== Test: push() ===\n");
StackNode *stack = NULL; StackNode *stack = NULL;
int wert1 = 42; int wert1 = 42;
stack = push(stack, &wert1); stack = push(stack, &wert1);
int *topValue = (int *)(stack->data); int *topValue = (int *)(stack->data);
if(topValue != NULL && *topValue == 42)
TEST_ASSERT_NOT_NULL(topValue); {
TEST_ASSERT_EQUAL_INT(42, *topValue); printf("Test 1: Erstes Element erfolgreich gepusht!\n");
}
else
{
printf("Test 1: FEHLGESCHLAGEN!\n");
}
int wert2 = 12; int wert2 = 12;
@ -33,19 +27,23 @@ void testeStackBeschreiben()
topValue = (int *)(stack->data); topValue = (int *)(stack->data);
int *secondValue = (int *)((stack->next)->data); int *secondValue = (int *)((stack->next)->data);
TEST_ASSERT_NOT_NULL(topValue); if(topValue != NULL && *topValue == 12.25 && secondValue != NULL && *secondValue == 42)
TEST_ASSERT_EQUAL_INT(12, *topValue); {
TEST_ASSERT_NOT_NULL(secondValue); printf("Test 2: Zweites Element erfolgreich gepusht!\n");
TEST_ASSERT_EQUAL_INT(42, *secondValue); }
else
{
printf("Test 2: FEHLGESCHLAGEN!\n");
}
//printf("=== Ende Test: push() ===\n\n"); printf("=== Ende Test: push() ===\n\n");
return; return;
} }
void testepop() void testepop()
{ {
//printf("=== Test: pop() ===\n"); printf("=== Test: pop() ===\n");
StackNode *stack = NULL; StackNode *stack = NULL;
int wert1 = 20; int wert1 = 20;
@ -58,15 +56,21 @@ void testepop()
int *topValue = (int *)(stack->data); int *topValue = (int *)(stack->data);
TEST_ASSERT_NOT_NULL(topValue); if(topValue != NULL && *topValue == 20)
TEST_ASSERT_EQUAL_INT(20, *topValue); {
printf("Test: Erstes Element erfolgreich gelöscht!\n");
}
else
{
printf("Test 1: FEHLGESCHLAGEN!\n");
}
//printf("=== Ende Test: pop() ===\n\n"); printf("=== Ende Test: pop() ===\n\n");
} }
void testetop() void testetop()
{ {
//printf("=== Test: top() ===\n"); printf("=== Test: top() ===\n");
StackNode *stack = NULL; StackNode *stack = NULL;
int wert1 = 20; int wert1 = 20;
@ -77,15 +81,21 @@ void testetop()
int *topValue = top(stack); int *topValue = top(stack);
TEST_ASSERT_NOT_NULL(topValue); if(topValue != NULL && *topValue == 74)
TEST_ASSERT_EQUAL_INT(74, *topValue); {
printf("Test: top() gibt korrektes Element zurück!\n");
}
else
{
printf("Test: FEHLGESCHLAGEN!\n");
}
//printf("=== Ende Test: top() ===\n\n"); printf("=== Ende Test: top() ===\n\n");
} }
void testeclearStack() void testeclearStack()
{ {
//printf("=== Test: clearStack() ===\n"); printf("=== Test: clearStack() ===\n");
StackNode *stack = NULL; StackNode *stack = NULL;
int wert1 = 20; int wert1 = 20;
@ -96,25 +106,16 @@ void testeclearStack()
clearStack(stack); clearStack(stack);
//printf("Test: clearStack() aufgerufen. Speicher freigegeben.\n"); printf("Test: clearStack() aufgerufen. Speicher freigegeben.\n");
//printf("=== Ende Test: clearStack() ===\n\n"); printf("=== Ende Test: clearStack() ===\n\n");
} }
int main() int main()
{ {
UNITY_BEGIN(); testeStackBeschreiben();
//printf("...");
RUN_TEST(testeStackBeschreiben);
RUN_TEST(testepop);
RUN_TEST(testetop);
RUN_TEST(testeclearStack);
/*testeStackBeschreiben();
testepop(); testepop();
testetop(); testetop();
testeclearStack();*/ testeclearStack();
return UNITY_END(); return 0;
} }