Implement first test

.gitignore

@@ -1,3 +1,5 @@
 doble_initial
+stackTests
+bintreeTests
 *.o
 *.exe

bintree.c

@@ -12,7 +12,55 @@
 // if isDuplicate is NULL, otherwise ignores duplicates and sets isDuplicate to 1 (or to 0 if a new entry is added).
 TreeNode *addToTree(TreeNode *root, const void *data, size_t dataSize, CompareFctType compareFct, int *isDuplicate)
 {
+    
+    if(root == NULL){
+        //Allocate Memory for Node
+        TreeNode *newNode = calloc(1, sizeof(TreeNode));
+        if(newNode == NULL){
+            return NULL; //Memory allocation failed
+        }
 
+        //Allocate Memory for data
+        newNode->data = malloc(dataSize);
+        if(newNode->data == NULL){
+            free(newNode); //Free unused Memory
+            return NULL;; //Memory allocation failed
+        }
+        memcpy(newNode->data, data, dataSize); //Copy Data
+
+        newNode->left = NULL;
+        newNode->right = NULL;
+
+        if(isDuplicate != NULL){
+            *isDuplicate = 0;
+        }
+
+        return newNode;
+
+    }
+    int cmp = compareFct(root->data, data);
+    
+    if(cmp == 0){
+        //Duplicate
+        if(isDuplicate != NULL){
+            //Ignore duplicate
+            *isDuplicate = 1;
+            return root;
+        } else{
+            //Accept duplicate
+            root->right = addToTree(root->right, data, dataSize, compareFct, NULL);
+        }
+    }
+    else if (cmp > 0)
+    {
+        //Data is smaller -> left
+        root->left = addToTree(root->left, data, dataSize, compareFct, isDuplicate);
+    }else{
+        //Data is bigger -> right
+        root->right = addToTree(root->right, data, dataSize, compareFct, isDuplicate);
+    }
+    
+    return root;
 }
 
 // Iterates over the tree given by root. Follows the usage of strtok. If tree is NULL, the next entry of the last tree given is returned in ordering direction.
@@ -20,17 +68,50 @@ TreeNode *addToTree(TreeNode *root, const void *data, size_t dataSize, CompareFc
 // push the top node and push all its left nodes.
 void *nextTreeData(TreeNode *root)
 {
+    static StackNode *stack = NULL;
+    static TreeNode *current = NULL;
 
-}
+    if(root != NULL){
+        clearStack(stack);
+        stack = NULL;
+        current = root;
+    }
+
+    while (current != NULL)
+    {
+        stack = push(stack, current);
+        current = current->left;
+    }
+
+    TreeNode *node = (TreeNode *)top(stack);
+    stack = pop(stack);
+
+    current = node->right;
+
+    return node->data;
+    
+} 
 
 // Releases all memory resources (including data copies).
 void clearTree(TreeNode *root)
 {
+    if(root == NULL){
+        return;
+    }
+    
+    clearTree(root->left);
+    clearTree(root->right);
 
+    free(root->data);
+    free(root);
+    
 }
 
 // Returns the number of entries in the tree given by root.
 unsigned int treeSize(const TreeNode *root)
 {
-
+    if(root == NULL){
+        return 0;
+    }
+    return 1 + treeSize(root->left) + treeSize(root->right);
 }

bintreeTest.c

@@ -0,0 +1,48 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "unity.h"
+#include "bintree.h"
+
+int compareInts(const void *arg1, const void *arg2){
+    int val1 = *(int *)arg1;
+    int val2 = *(int *)arg2;
+
+    if(val1 < val2) return 1;
+    if(val1 > val2) return -1;
+    return 0;
+}
+
+int compareStrings(const void *arg1, const void *arg2){
+    return -strcmp((const char *)arg1, (const char *)arg2);
+}
+
+
+void setUp(void){
+    //Use if needed    
+}
+void tearDown(void){
+    //Use if needed
+}
+
+void test_addToTree_singleElement(void){
+    int value = 42;
+    TreeNode *tree = NULL;
+
+    tree = addToTree(tree, &value, sizeof(int), compareInts, NULL);
+
+    TEST_ASSERT_NOT_NULL(tree);
+    TEST_ASSERT_EQUAL_INT(value, *(int *)tree->data);
+    TEST_ASSERT_NULL(tree->left);
+    TEST_ASSERT_NULL(tree->right);
+}
+int main(){
+    UNITY_BEGIN();
+
+    printf("\n============================\nBintree tests\n============================\n");
+
+    RUN_TEST(test_addToTree_singleElement);
+
+    return UNITY_END();
+    
+}

makefile

@@ -39,6 +39,8 @@ doble_initial:
 # --------------------------
 stackTests: stack.o test_stack.c $(unityfolder)/unity.c
 	$(CC) $(CFLAGS) -I$(unityfolder) -o stackTests test_stack.c stack.o $(unityfolder)/unity.c ${LDFLAGS}
+bintreeTests: bintree.o stack.o bintreeTest.c $(unityfolder)/unity.c
+	$(CC) $(CFLAGS) -I$(unityfolder) -o bintreeTests bintreeTest.c bintree.o stack.o $(unityfolder)/unity.c ${LDFLAGS}
 unitTests:
 	echo "needs to be implemented"
 
@@ -47,7 +49,7 @@ unitTests:
 # --------------------------
 clean:
 ifeq ($(OS),Windows_NT)
-	del /f *.o doble
+	del /f *.o doble doble_initial bintreeTests stackTests
 else
-	rm -f *.o doble
+	rm -f *.o doble doble_initial bintreeTests stackTests
 endif