mirror of
https://github.com/krgamestudios/Toy.git
synced 2026-04-15 14:54:07 +10:00
Prepped for #160, fixed a stack-shrink bug
This commit is contained in:
@@ -6,30 +6,30 @@
|
||||
int test_array(void) {
|
||||
//test allocation and free
|
||||
{
|
||||
Toy_Array* array = TOY_ARRAY_ALLOCATE();
|
||||
TOY_ARRAY_FREE(array);
|
||||
Toy_Array* array = Toy_resizeArray(NULL, TOY_ARRAY_INITIAL_CAPACITY);
|
||||
array = Toy_resizeArray(array, 0);
|
||||
}
|
||||
|
||||
//test initial data
|
||||
{
|
||||
Toy_Array* array = TOY_ARRAY_ALLOCATE();
|
||||
Toy_Array* array = Toy_resizeArray(NULL, TOY_ARRAY_INITIAL_CAPACITY);
|
||||
|
||||
//check you can access the memory
|
||||
array->data[1] = TOY_VALUE_FROM_INTEGER(42);
|
||||
|
||||
TOY_ARRAY_FREE(array);
|
||||
array = Toy_resizeArray(array, 0);
|
||||
}
|
||||
|
||||
//test multiple arrays (no overlaps or conflicts)
|
||||
{
|
||||
Toy_Array* array1 = TOY_ARRAY_ALLOCATE();
|
||||
Toy_Array* array2 = TOY_ARRAY_ALLOCATE();
|
||||
Toy_Array* array1 = Toy_resizeArray(NULL, TOY_ARRAY_INITIAL_CAPACITY);
|
||||
Toy_Array* array2 = Toy_resizeArray(NULL, TOY_ARRAY_INITIAL_CAPACITY);
|
||||
|
||||
array1->data[1] = TOY_VALUE_FROM_INTEGER(42);
|
||||
array2->data[1] = TOY_VALUE_FROM_INTEGER(42);
|
||||
|
||||
TOY_ARRAY_FREE(array1);
|
||||
TOY_ARRAY_FREE(array2);
|
||||
Toy_resizeArray(array1, 0);
|
||||
Toy_resizeArray(array2, 0);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -83,11 +83,11 @@ int test_stack_basics(void) {
|
||||
}
|
||||
|
||||
int test_stack_stress(void) {
|
||||
//stress the stack's contents
|
||||
//stress the stack
|
||||
{
|
||||
Toy_Stack* stack = Toy_allocateStack();
|
||||
|
||||
//allocate 500 values
|
||||
//push 500 values
|
||||
for (int i = 0; i < 500; i++) {
|
||||
Toy_pushStack(&stack, TOY_VALUE_FROM_INTEGER(i));
|
||||
}
|
||||
@@ -98,11 +98,28 @@ int test_stack_stress(void) {
|
||||
stack->capacity != 512 ||
|
||||
stack->count != 500)
|
||||
{
|
||||
fprintf(stderr, TOY_CC_ERROR "ERROR: failed to stress the Toy_Stack\n" TOY_CC_RESET);
|
||||
fprintf(stderr, TOY_CC_ERROR "ERROR: failed to stress push the Toy_Stack\n" TOY_CC_RESET);
|
||||
Toy_freeStack(stack);
|
||||
return -1;
|
||||
}
|
||||
|
||||
//pop each value
|
||||
while(stack->count > 0) {
|
||||
Toy_popStack(&stack); //ignore the results
|
||||
}
|
||||
|
||||
//check if it worked
|
||||
if (
|
||||
stack == NULL ||
|
||||
stack->capacity != TOY_STACK_INITIAL_CAPACITY || //reset to initial capacity
|
||||
stack->count != 0)
|
||||
{
|
||||
fprintf(stderr, TOY_CC_ERROR "ERROR: failed to stress pop the Toy_Stack\n" TOY_CC_RESET);
|
||||
Toy_freeStack(stack);
|
||||
return -1;
|
||||
}
|
||||
|
||||
//cleanup
|
||||
Toy_freeStack(stack);
|
||||
}
|
||||
|
||||
|
||||
@@ -9,6 +9,10 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
//util macros
|
||||
#define TOY_ARRAY_EXPAND(array) (array = (array != NULL && (array)->count + 1 > (array)->capacity ? Toy_resizeArray(array, (array)->capacity * TOY_ARRAY_EXPANSION_RATE) : array))
|
||||
#define TOY_ARRAY_PUSHBACK(array, value) (TOY_ARRAY_EXPAND(array), (array)->data[(array)->count++] = (value))
|
||||
|
||||
int test_value_creation(void) {
|
||||
//test for the correct size
|
||||
{
|
||||
@@ -68,7 +72,7 @@ int test_value_creation(void) {
|
||||
//test creating arrays
|
||||
{
|
||||
//setup
|
||||
Toy_Array* array = TOY_ARRAY_ALLOCATE();
|
||||
Toy_Array* array = Toy_resizeArray(NULL, TOY_ARRAY_INITIAL_CAPACITY);
|
||||
TOY_ARRAY_PUSHBACK(array, TOY_VALUE_FROM_INTEGER(42));
|
||||
TOY_ARRAY_PUSHBACK(array, TOY_VALUE_FROM_INTEGER(69));
|
||||
TOY_ARRAY_PUSHBACK(array, TOY_VALUE_FROM_INTEGER(8891));
|
||||
@@ -84,12 +88,12 @@ int test_value_creation(void) {
|
||||
)
|
||||
{
|
||||
fprintf(stderr, TOY_CC_ERROR "ERROR: 'array' value failed\n" TOY_CC_RESET);
|
||||
TOY_ARRAY_FREE(array);
|
||||
Toy_resizeArray(array, 0);
|
||||
return -1;
|
||||
}
|
||||
|
||||
//cleanup
|
||||
TOY_ARRAY_FREE(array);
|
||||
Toy_resizeArray(array, 0);
|
||||
}
|
||||
|
||||
return 0;
|
||||
@@ -139,7 +143,7 @@ int test_value_copying(void) {
|
||||
//test copy arrays
|
||||
{
|
||||
//setup
|
||||
Toy_Array* array = TOY_ARRAY_ALLOCATE();
|
||||
Toy_Array* array = Toy_resizeArray(NULL, TOY_ARRAY_INITIAL_CAPACITY);
|
||||
TOY_ARRAY_PUSHBACK(array, TOY_VALUE_FROM_INTEGER(42));
|
||||
TOY_ARRAY_PUSHBACK(array, TOY_VALUE_FROM_INTEGER(69));
|
||||
TOY_ARRAY_PUSHBACK(array, TOY_VALUE_FROM_INTEGER(8891));
|
||||
@@ -186,7 +190,7 @@ int test_value_hashing(void) {
|
||||
//skip float
|
||||
Toy_Value s = TOY_VALUE_FROM_STRING(Toy_createString(&bucket, "Hello world"));
|
||||
|
||||
Toy_Array* array = TOY_ARRAY_ALLOCATE();
|
||||
Toy_Array* array = Toy_resizeArray(NULL, TOY_ARRAY_INITIAL_CAPACITY);
|
||||
TOY_ARRAY_PUSHBACK(array, TOY_VALUE_FROM_INTEGER(42));
|
||||
TOY_ARRAY_PUSHBACK(array, TOY_VALUE_FROM_INTEGER(69));
|
||||
TOY_ARRAY_PUSHBACK(array, TOY_VALUE_FROM_INTEGER(8891));
|
||||
@@ -202,13 +206,13 @@ int test_value_hashing(void) {
|
||||
)
|
||||
{
|
||||
fprintf(stderr, TOY_CC_ERROR "ERROR: Unexpected hash of a value\n" TOY_CC_RESET);
|
||||
TOY_ARRAY_FREE(array);
|
||||
Toy_resizeArray(array, 0);
|
||||
Toy_freeBucket(&bucket);
|
||||
return -1;
|
||||
}
|
||||
|
||||
//cleanup
|
||||
TOY_ARRAY_FREE(array);
|
||||
Toy_resizeArray(array, 0);
|
||||
Toy_freeBucket(&bucket);
|
||||
}
|
||||
|
||||
@@ -259,14 +263,14 @@ int test_value_equality(void) {
|
||||
//again with arrays
|
||||
{
|
||||
//setup
|
||||
Toy_Array* array1 = TOY_ARRAY_ALLOCATE();
|
||||
Toy_Array* array1 = Toy_resizeArray(NULL, TOY_ARRAY_INITIAL_CAPACITY);
|
||||
TOY_ARRAY_PUSHBACK(array1, TOY_VALUE_FROM_INTEGER(42));
|
||||
TOY_ARRAY_PUSHBACK(array1, TOY_VALUE_FROM_INTEGER(69));
|
||||
TOY_ARRAY_PUSHBACK(array1, TOY_VALUE_FROM_INTEGER(8891));
|
||||
|
||||
Toy_Value value1 = TOY_VALUE_FROM_ARRAY(array1);
|
||||
|
||||
Toy_Array* array2 = TOY_ARRAY_ALLOCATE();
|
||||
Toy_Array* array2 = Toy_resizeArray(NULL, TOY_ARRAY_INITIAL_CAPACITY);
|
||||
TOY_ARRAY_PUSHBACK(array2, TOY_VALUE_FROM_INTEGER(42));
|
||||
TOY_ARRAY_PUSHBACK(array2, TOY_VALUE_FROM_INTEGER(69));
|
||||
TOY_ARRAY_PUSHBACK(array2, TOY_VALUE_FROM_INTEGER(8891));
|
||||
@@ -512,7 +516,7 @@ int test_value_stringify(void) {
|
||||
Toy_Bucket* bucket = Toy_allocateBucket(TOY_BUCKET_SMALL);
|
||||
|
||||
//setup
|
||||
Toy_Array* array = TOY_ARRAY_ALLOCATE();
|
||||
Toy_Array* array = Toy_resizeArray(NULL, TOY_ARRAY_INITIAL_CAPACITY);
|
||||
TOY_ARRAY_PUSHBACK(array, TOY_VALUE_FROM_INTEGER(42));
|
||||
TOY_ARRAY_PUSHBACK(array, TOY_VALUE_FROM_INTEGER(69));
|
||||
TOY_ARRAY_PUSHBACK(array, TOY_VALUE_FROM_INTEGER(8891));
|
||||
@@ -525,14 +529,14 @@ int test_value_stringify(void) {
|
||||
{
|
||||
fprintf(stderr, TOY_CC_ERROR "ERROR: stringify array '[42,69,8891]' failed\n" TOY_CC_RESET);
|
||||
free(buffer);
|
||||
TOY_ARRAY_FREE(array);
|
||||
array = Toy_resizeArray(array, 0);
|
||||
Toy_freeBucket(&bucket);
|
||||
return -1;
|
||||
}
|
||||
|
||||
//cleanup
|
||||
free(buffer);
|
||||
TOY_ARRAY_FREE(array);
|
||||
Toy_resizeArray(array, 0);
|
||||
Toy_freeBucket(&bucket);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user