Compare commits

..

No commits in common. "70c0f9bcafa8c6610343b73e6f19576af7fef930" and "06168693b73d3224ee0a03e984716a5dbf42a6b0" have entirely different histories.

7 changed files with 10 additions and 138 deletions

View File

@ -1,6 +0,0 @@
{
"files.associations": {
"stdio.h": "c",
"stdlib.h": "c"
}
}

View File

@ -37,8 +37,6 @@ doble_initial:
# -------------------------- # --------------------------
# Unit Tests # Unit Tests
# -------------------------- # --------------------------
stackTests: stack.o test_stack.c $(unityfolder)/unity.c
$(CC) $(CFLAGS) -I$(unityfolder) -o stackTests test_stack.c stack.o $(unityfolder)/unity.c ${LDFLAGS}
unitTests: unitTests:
echo "needs to be implemented" echo "needs to be implemented"

29
stack.c
View File

@ -10,51 +10,24 @@
// Pushes data as pointer onto the stack. // Pushes data as pointer onto the stack.
StackNode *push(StackNode *stack, void *data) StackNode *push(StackNode *stack, void *data)
{ {
//pointer onto new struct
StackNode* newNode = malloc(sizeof(StackNode));
newNode->data = data;
//*stack := first node of the stack; is now the second to first node
newNode->nextNode = stack;
return newNode;
} }
// Deletes the top element of the stack (latest added element) and releases its memory. (Pointer to data has to be // Deletes the top element of the stack (latest added element) and releases its memory. (Pointer to data has to be
// freed by caller.) // freed by caller.)
StackNode *pop(StackNode *stack) StackNode *pop(StackNode *stack)
{ {
//getting the second to first node
StackNode* tmp = stack->nextNode;
// data should be freed by the caller
// free(stack->data);
// stack->data = NULL;
free(stack);
stack = NULL;
return tmp;
} }
// Returns the data of the top element. // Returns the data of the top element.
void *top(StackNode *stack) void *top(StackNode *stack)
{ {
//No stack --> No data-pointer
if (stack == NULL) return NULL;
return stack->data;
} }
// Clears stack and releases all memory. // Clears stack and releases all memory.
void clearStack(StackNode *stack) void clearStack(StackNode *stack)
{ {
if (stack == NULL) return;
if (stack->nextNode != NULL) clearStack(stack->nextNode);
// date should be freed by the caller.
// free(stack->data);
// stack->data = NULL;
free(stack);
// technically not needed (dangling pointer)
stack = NULL;
} }

View File

@ -7,10 +7,7 @@ The latest element is taken from the stack. */
#include <stdlib.h> #include <stdlib.h>
typedef struct StackNode { //TODO: passenden Datentyp als struct anlegen
void* data;
struct StackNode* nextNode;
} StackNode;
// Pushes data as pointer onto the stack. // Pushes data as pointer onto the stack.
StackNode *push(StackNode *stack, void *data); StackNode *push(StackNode *stack, void *data);

Binary file not shown.

View File

@ -1,90 +0,0 @@
#include <stdlib.h>
#include <stdio.h>
#include "unity.h"
#include "stack.h"
void test_topReturnsCorrectValue(void) {
// 1. Arrange
int* value1;
int* value2;
int* outVal1;
int* outVal2;
value1 = malloc(sizeof(int));
value2 = malloc(sizeof(int));
StackNode* startNode = NULL;
// 2. Act
*value1 = 1234;
*value2 = 5678;
startNode = push(startNode, value1);
// new top node is node 2
startNode = push(startNode, value2);
outVal2 = top(startNode);
// node 1 should now be the top node
startNode = pop(startNode);
outVal1 = top(startNode);
// 3. Assert
//Also tests for the functionality of 'push'
TEST_ASSERT_EQUAL_INT32(*value1, *outVal1);
TEST_ASSERT_EQUAL_INT32(*value2, *outVal2);
free(value1);
value1 = NULL;
free(value2);
value2 = NULL;
clearStack(startNode);
}
void test_topReturnsNullOnNotExistingStack(void) {
// 1. Arrange
StackNode* startNode = NULL;
int* data;
// 2. Act
data = top(startNode);
//3. Assert
TEST_ASSERT_NULL(data);
}
void test_popRemovesElements(void) {
// 1. Arrange
StackNode* startNode = NULL;
// 2. Act
// Entering some Elements into Stack (could be added manually for testing)
startNode = push(startNode, NULL);
startNode = push(startNode, NULL);
startNode = push(startNode, NULL);
startNode = push(startNode, NULL);
// Now removing created Elements
startNode = pop(startNode);
startNode = pop(startNode);
startNode = pop(startNode);
startNode = pop(startNode);
// 3. Assert
TEST_ASSERT_NULL(startNode);
}
void setUp(void){
}
void tearDown(void){
}
int main(void) {
UNITY_BEGIN();
printf("\n============================\nStack tests\n============================\n");
RUN_TEST(test_topReturnsNullOnNotExistingStack);
RUN_TEST(test_topReturnsCorrectValue);
RUN_TEST(test_popRemovesElements);
return UNITY_END();
}