Merge branch 'main' of https://git.efi.th-nuernberg.de/gitea/hallerni98888/info2Praktikum-DobleSpiel

.gitignore

@@ -1,4 +1,4 @@
-doble_initial.exe
-highscores.txt
-runStackTest.exe
-stack.o
+doble_initial.exe
+highscores.txt
+runStackTest.exe
+stack.o

makefile

@@ -1,49 +1,49 @@
-CC = gcc
-FLAGS = -g -Wall -lm
-
-ifeq ($(OS),Windows_NT)
-	include makefile_windows.variables
-else
-	UNAME = $(shell uname)
-	ifeq ($(UNAME),Linux)
-		include makefile_linux.variables
-	else
-		include makefile_mac.variables
-	endif
-endif
-
-raylibfolder = ./raylib
-unityfolder = ./unity
-
-# --------------------------
-# Initiales Programm bauen (zum ausprobieren)
-# --------------------------
-doble_initial:
-	$(CC) -o doble_initial $(BINARIES)/libdoble_complete.a
-
-# --------------------------
-# Selbst implementiertes Programm bauen
-# --------------------------
-program_obj_files = stack.o bintree.o numbers.o timer.o highscore.o
-
-doble : main.o $(program_obj_files)
-	$(CC) $(FLAGS) $^ -o doble
-
-$(program_obj_filesobj_files): %.o: %.c
-	$(CC) -c $(FLAGS) $^ -o $@
-
-# --------------------------
-# Unit Tests
-# --------------------------
-unitTests: stack.o test_stack.c $(unityfolder)/unity.c
-	$(CC) $(FLAGS) -I$(unityfolder) -o runStackTest test_stack.c stack.o $(unityfolder)/unity.c
-
-# --------------------------
-# Clean
-# --------------------------
-clean:
-ifeq ($(OS),Windows_NT)
-	del /f *.o doble
-else
-	rm -f *.o doble
+CC = gcc
+FLAGS = -g -Wall -lm
+
+ifeq ($(OS),Windows_NT)
+	include makefile_windows.variables
+else
+	UNAME = $(shell uname)
+	ifeq ($(UNAME),Linux)
+		include makefile_linux.variables
+	else
+		include makefile_mac.variables
+	endif
+endif
+
+raylibfolder = ./raylib
+unityfolder = ./unity
+
+# --------------------------
+# Initiales Programm bauen (zum ausprobieren)
+# --------------------------
+doble_initial:
+	$(CC) -o doble_initial $(BINARIES)/libdoble_complete.a
+
+# --------------------------
+# Selbst implementiertes Programm bauen
+# --------------------------
+program_obj_files = stack.o bintree.o numbers.o timer.o highscore.o
+
+doble : main.o $(program_obj_files)
+	$(CC) $(FLAGS) $^ -o doble
+
+$(program_obj_filesobj_files): %.o: %.c
+	$(CC) -c $(FLAGS) $^ -o $@
+
+# --------------------------
+# Unit Tests
+# --------------------------
+unitTests: stack.o test_stack.c $(unityfolder)/unity.c
+	$(CC) $(FLAGS) -I$(unityfolder) -o runStackTest test_stack.c stack.o $(unityfolder)/unity.c
+
+# --------------------------
+# Clean
+# --------------------------
+clean:
+ifeq ($(OS),Windows_NT)
+	del /f *.o doble
+else
+	rm -f *.o doble
 endif

stack.h

@@ -1,29 +1,29 @@
-#ifndef STACK_H
-#define STACK_H
-
-/* A stack is a special type of queue which uses the LIFO (last in, first out) principle. 
-This means that with each new element all other elements are pushed deeper into the stack. 
-The latest element is taken from the stack. */
-
-#include <stdlib.h>
-
-//TODO: passenden Datentyp als struct anlegen
-typedef struct Node {
-    int value;
-    struct Node* next;
-} StackNode;
-
-// Pushes data as pointer onto the stack.
-StackNode *push(StackNode *stack, void *data);
-
-// Deletes the top element of the stack (latest added element) and releases its memory. (Pointer to data has to be
-// freed by caller.)
-StackNode *pop(StackNode *stack);
-
-// Returns the data of the top element.
-void *top(StackNode *stack);
-
-// Clears stack and releases all memory.
-void clearStack(StackNode *stack);
-
-#endif
+#ifndef STACK_H
+#define STACK_H
+
+/* A stack is a special type of queue which uses the LIFO (last in, first out) principle. 
+This means that with each new element all other elements are pushed deeper into the stack. 
+The latest element is taken from the stack. */
+
+#include <stdlib.h>
+
+//TODO: passenden Datentyp als struct anlegen
+typedef struct Node {
+    int value;
+    struct Node* next;
+} StackNode;
+
+// Pushes data as pointer onto the stack.
+StackNode *push(StackNode *stack, void *data);
+
+// Deletes the top element of the stack (latest added element) and releases its memory. (Pointer to data has to be
+// freed by caller.)
+StackNode *pop(StackNode *stack);
+
+// Returns the data of the top element.
+void *top(StackNode *stack);
+
+// Clears stack and releases all memory.
+void clearStack(StackNode *stack);
+
+#endif

test_stack.c

@@ -1,67 +1,112 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include "stack.h"
-#include "unity.h"
-
-void test_push(void)
-{
-    StackNode *testNode;
-    int data = 1;
-
-    // Test für leeren Stack
-    testNode = push(NULL, &data);
-    TEST_ASSERT_NOT_NULL(&testNode);
-    TEST_ASSERT_NULL(testNode->next);
-    TEST_ASSERT_EQUAL_INT(1, testNode->value);
-
-    data = 2;
-
-    // Test für nicht leeren Stack
-    testNode = push(testNode, &data);
-    TEST_ASSERT_NOT_NULL(&testNode);
-    TEST_ASSERT_NOT_NULL(testNode->next);
-    TEST_ASSERT_NULL(testNode->next->next);
-    TEST_ASSERT_EQUAL_INT(1, testNode->value);
-    TEST_ASSERT_EQUAL_INT(2, testNode->next->value);
-}
-
-void test_pop(void)
-{
-    
-    TEST_ASSERT_NULL(pop(NULL));
-
-}
-
-void test_top(void)
-{
-
-    TEST_ASSERT_NULL(top(NULL));
-}
-
-void test_clear(void)
-{
-
-    // TEST_ASSERT_NULL(clearStack(NULL));
-}
-
-void setUp(void) {
-    // Falls notwendig, kann hier Vorbereitungsarbeit gemacht werden
-}
-
-void tearDown(void) {
-    // Hier kann Bereinigungsarbeit nach jedem Test durchgeführt werden
-}
-
-int main()
-{
-    UNITY_BEGIN();
-
-    printf("============================\nStack tests\n============================\n");
-
-    RUN_TEST(test_push);
-    RUN_TEST(test_pop);
-    RUN_TEST(test_top);
-    RUN_TEST(test_clear);
-
-    return UNITY_END();
+#include <stdio.h>
+#include <stdlib.h>
+#include "stack.h"
+#include "unity.h"
+
+void test_push(void)
+{
+    StackNode *testNode;
+    int data = 1;
+
+    // Test für leeren Stack
+    testNode = push(NULL, &data);
+    TEST_ASSERT_NOT_NULL(&testNode);
+    TEST_ASSERT_NULL(testNode->next);
+    TEST_ASSERT_EQUAL_INT(1, testNode->value);
+
+    data = 2;
+
+    // Test für nicht leeren Stack
+    testNode = push(testNode, &data);
+    TEST_ASSERT_NOT_NULL(&testNode);
+    TEST_ASSERT_NOT_NULL(testNode->next);
+    TEST_ASSERT_NULL(testNode->next->next);
+    TEST_ASSERT_EQUAL_INT(1, testNode->value);
+    TEST_ASSERT_EQUAL_INT(2, testNode->next->value);
+}
+
+StackNode* setup(int value, StackNode* next) {
+    StackNode* node = malloc(sizeof(StackNode)); // allocate memory on heap
+    if (node == NULL) {
+        perror("malloc failed");
+        exit(EXIT_FAILURE); // or handle the error differently
+    }
+    node->value = value;
+    node->next = next;
+    return node;
+}
+
+void test_pop(void)
+{   
+    StackNode* node2 = setup(3, NULL);
+    StackNode* node1 = setup(2, node2);
+    StackNode* header = setup(1, node1);
+    StackNode* temp;
+
+    temp = pop(header);
+    int after = 0;
+    while(temp) 
+    {
+        after++;
+        temp = temp->next;
+    }
+
+    
+    TEST_ASSERT_EQUAL_INT(2, after);
+    TEST_ASSERT_NULL(node1->next);
+}
+
+void test_top(void)
+{
+    StackNode* node2 = setup(3, NULL);
+    StackNode* node1 = setup(2, node2);
+    StackNode* header = setup(1, node1);
+
+    int data = *(int *)top(header);
+    TEST_ASSERT_EQUAL_INT(node2->value, data);
+}
+
+void test_clear()
+{
+    StackNode* node2 = setup(3, NULL);
+    StackNode* node1 = setup(2, node2);
+    StackNode* header = setup(1, node1);
+    StackNode* temp;
+    
+    clearStack(header);
+    temp = header;
+    
+    int after = 0;
+    while(temp) 
+    {
+        after++;
+        temp = temp->next;
+    }
+
+    
+    TEST_ASSERT_NULL(after);
+}
+
+void setUp(void)
+{
+    // Falls notwendig, kann hier Vorbereitungsarbeit gemacht werden
+}
+
+void tearDown(void)
+{
+    // Hier kann Bereinigungsarbeit nach jedem Test durchgeführt werden
+}
+
+int main()
+{
+    UNITY_BEGIN();
+
+    printf("============================\nStack tests\n============================\n");
+
+    RUN_TEST(test_push);
+    RUN_TEST(test_pop);
+    RUN_TEST(test_top);
+    RUN_TEST(test_clear);
+
+    return UNITY_END();
 }

unittest.h

@@ -1,10 +1,10 @@
-#ifndef UNITTTESTS_H
-#define UNITTTESTS_H
-
-#include <stdio.h>
-
-typedef int (*UnitTestType)(void);
-
-#define RUN_UNIT_TEST(fct) printf("%80s: %d\n", #fct, fct())
-
-#endif
+#ifndef UNITTTESTS_H
+#define UNITTTESTS_H
+
+#include <stdio.h>
+
+typedef int (*UnitTestType)(void);
+
+#define RUN_UNIT_TEST(fct) printf("%80s: %d\n", #fct, fct())
+
+#endif