ceedling 0.18.0 → 0.19.0

data/vendor/unity/extras/fixture/src/unity_fixture.c

@@ -6,21 +6,19 @@
 ========================================== */
 
 #include <string.h>
-#include <stdio.h>
 #include "unity_fixture.h"
 #include "unity_internals.h"
 
 UNITY_FIXTURE_T UnityFixture;
 
 //If you decide to use the function pointer approach.
-int (*outputChar)(int) = putchar;
+//Build with -D UNITY_OUTPUT_CHAR=outputChar and include <stdio.h>
+//int (*outputChar)(int) = putchar;
 
-int verbose = 0;
-
-void setUp(void);
-void tearDown(void);
+#if !defined(UNITY_WEAK_ATTRIBUTE) && !defined(UNITY_WEAK_PRAGMA)
 void setUp(void)    { /*does nothing*/ }
 void tearDown(void) { /*does nothing*/ }
+#endif
 
 static void announceTestRun(unsigned int runNumber)
 {
@@ -28,7 +26,7 @@ static void announceTestRun(unsigned int runNumber)
     UnityPrintNumber(runNumber+1);
     UnityPrint(" of ");
     UnityPrintNumber(UnityFixture.RepeatCount);
-    UNITY_OUTPUT_CHAR('\n');
+    UNITY_PRINT_EOL();
 }
 
 int UnityMain(int argc, const char* argv[], void (*runAllTests)(void))
@@ -43,14 +41,14 @@ int UnityMain(int argc, const char* argv[], void (*runAllTests)(void))
         UnityBegin(argv[0]);
         announceTestRun(r);
         runAllTests();
-        UNITY_OUTPUT_CHAR('\n');
+        UNITY_PRINT_EOL();
         UnityEnd();
     }
 
     return UnityFailureCount();
 }
 
-static int selected(const char * filter, const char * name)
+static int selected(const char* filter, const char* name)
 {
     if (filter == 0)
         return 1;
@@ -67,18 +65,13 @@ static int groupSelected(const char* group)
     return selected(UnityFixture.GroupFilter, group);
 }
 
-static void runTestCase(void)
-{
-
-}
-
 void UnityTestRunner(unityfunction* setup,
-        unityfunction* testBody,
-        unityfunction* teardown,
-        const char * printableName,
-        const char * group,
-        const char * name,
-        const char * file, int line)
+                     unityfunction* testBody,
+                     unityfunction* teardown,
+                     const char* printableName,
+                     const char* group,
+                     const char* name,
+                     const char* file, int line)
 {
     if (testSelected(name) && groupSelected(group))
     {
@@ -95,7 +88,6 @@ void UnityTestRunner(unityfunction* setup,
         UnityMalloc_StartTest();
         UnityPointer_Init();
 
-        runTestCase();
         if (TEST_PROTECT())
         {
             setup();
@@ -115,15 +107,18 @@ void UnityTestRunner(unityfunction* setup,
     }
 }
 
-void UnityIgnoreTest(const char * printableName)
+void UnityIgnoreTest(const char* printableName, const char* group, const char* name)
 {
-    Unity.NumberOfTests++;
-    Unity.CurrentTestIgnored = 1;
-    if (!UnityFixture.Verbose)
-        UNITY_OUTPUT_CHAR('!');
-    else
-        UnityPrint(printableName);
-    UnityConcludeFixtureTest();
+    if (testSelected(name) && groupSelected(group))
+    {
+        Unity.NumberOfTests++;
+        Unity.CurrentTestIgnored = 1;
+        if (!UnityFixture.Verbose)
+            UNITY_OUTPUT_CHAR('!');
+        else
+            UnityPrint(printableName);
+        UnityConcludeFixtureTest();
+    }
 }
 
 
@@ -154,57 +149,66 @@ void UnityMalloc_MakeMallocFailAfterCount(int countdown)
     malloc_fail_countdown = countdown;
 }
 
-#ifdef malloc
+// These definitions are always included from unity_fixture_malloc_overrides.h
+// We undef to use them or avoid conflict with <stdlib.h> per the C standard
 #undef malloc
-#endif
-
-#ifdef free
 #undef free
-#endif
-
-#ifdef calloc
 #undef calloc
-#endif
-
-#ifdef realloc
 #undef realloc
-#endif
 
+#ifdef UNITY_EXCLUDE_STDLIB_MALLOC
+static unsigned char unity_heap[UNITY_INTERNAL_HEAP_SIZE_BYTES];
+static unsigned int  heap_index;
+#else
 #include <stdlib.h>
-#include <string.h>
+#endif
 
 typedef struct GuardBytes
 {
     size_t size;
-    char guard[sizeof(size_t)];
+    char guard_space[4];
 } Guard;
 
 
-static const char * end = "END";
+static const char end[] = "END";
 
-void * unity_malloc(size_t size)
+void* unity_malloc(size_t size)
 {
     char* mem;
     Guard* guard;
+    size_t total_size = size + sizeof(Guard) + sizeof(end);
 
     if (malloc_fail_countdown != MALLOC_DONT_FAIL)
     {
         if (malloc_fail_countdown == 0)
-            return 0;
+            return NULL;
         malloc_fail_countdown--;
     }
 
+    if (size == 0) return NULL;
+#ifdef UNITY_EXCLUDE_STDLIB_MALLOC
+    if (heap_index + total_size > UNITY_INTERNAL_HEAP_SIZE_BYTES)
+    {
+        guard = NULL;
+    }
+    else
+    {
+        guard = (Guard*) &unity_heap[heap_index];
+        heap_index += total_size;
+    }
+#else
+    guard = (Guard*)UNITY_FIXTURE_MALLOC(total_size);
+#endif
+    if (guard == NULL) return NULL;
     malloc_count++;
-
-    guard = (Guard*)malloc(size + sizeof(Guard) + 4);
     guard->size = size;
     mem = (char*)&(guard[1]);
-    memcpy(&mem[size], end, strlen(end) + 1);
+    memcpy(&mem[size], end, sizeof(end));
 
     return (void*)mem;
 }
 
-static int isOverrun(void * mem)
+static int isOverrun(void* mem)
 {
     Guard* guard = (Guard*)mem;
     char* memAsChar = (char*)mem;
@@ -213,18 +217,32 @@ static int isOverrun(void * mem)
     return strcmp(&memAsChar[guard->size], end) != 0;
 }
 
-static void release_memory(void * mem)
+static void release_memory(void* mem)
 {
     Guard* guard = (Guard*)mem;
     guard--;
 
     malloc_count--;
-    free(guard);
+#ifdef UNITY_EXCLUDE_STDLIB_MALLOC
+    if (mem == unity_heap + heap_index - guard->size - sizeof(end))
+    {
+        heap_index -= (guard->size + sizeof(Guard) + sizeof(end));
+    }
+#else
+    UNITY_FIXTURE_FREE(guard);
+#endif
 }
 
-void unity_free(void * mem)
+void unity_free(void* mem)
 {
-    int overrun = isOverrun(mem);//strcmp(&memAsChar[guard->size], end) != 0;
+    int overrun;
+
+    if (mem == NULL)
+    {
+        return;
+    }
+
+    overrun = isOverrun(mem);
     release_memory(mem);
     if (overrun)
     {
@@ -235,18 +253,17 @@ void unity_free(void * mem)
 void* unity_calloc(size_t num, size_t size)
 {
     void* mem = unity_malloc(num * size);
-    memset(mem, 0, num*size);
+    if (mem == NULL) return NULL;
+    memset(mem, 0, num * size);
     return mem;
 }
 
-void* unity_realloc(void * oldMem, size_t size)
+void* unity_realloc(void* oldMem, size_t size)
 {
     Guard* guard = (Guard*)oldMem;
-//    char* memAsChar = (char*)oldMem;
     void* newMem;
 
-    if (oldMem == 0)
-        return unity_malloc(size);
+    if (oldMem == NULL) return unity_malloc(size);
 
     guard--;
     if (isOverrun(oldMem))
@@ -258,15 +275,23 @@ void* unity_realloc(void * oldMem, size_t size)
     if (size == 0)
     {
         release_memory(oldMem);
-        return 0;
+        return NULL;
     }
 
-    if (guard->size >= size)
-        return oldMem;
+    if (guard->size >= size) return oldMem;
 
+#ifdef UNITY_EXCLUDE_STDLIB_MALLOC // Optimization if memory is expandable
+    if (oldMem == unity_heap + heap_index - guard->size - sizeof(end) &&
+        heap_index + size - guard->size <= UNITY_INTERNAL_HEAP_SIZE_BYTES)
+    {
+        release_memory(oldMem); // Not thread-safe, like unity_heap generally
+        return unity_malloc(size); // No memcpy since data is in place
+    }
+#endif
     newMem = unity_malloc(size);
+    if (newMem == NULL) return NULL; // Do not release old memory
     memcpy(newMem, oldMem, guard->size);
-    unity_free(oldMem);
+    release_memory(oldMem);
     return newMem;
 }
 
@@ -275,13 +300,13 @@ void* unity_realloc(void * oldMem, size_t size)
 //Automatic pointer restoration functions
 typedef struct _PointerPair
 {
-    struct _PointerPair * next;
-    void ** pointer;
-    void * old_value;
+    struct _PointerPair* next;
+    void** pointer;
+    void* old_value;
 } PointerPair;
 
 enum {MAX_POINTERS=50};
-static PointerPair pointer_store[MAX_POINTERS];
+static PointerPair pointer_store[MAX_POINTERS+1];
 static int pointer_index = 0;
 
 void UnityPointer_Init(void)
@@ -289,15 +314,19 @@ void UnityPointer_Init(void)
     pointer_index = 0;
 }
 
-void UnityPointer_Set(void ** pointer, void * newValue)
+void UnityPointer_Set(void** pointer, void* newValue)
 {
     if (pointer_index >= MAX_POINTERS)
+    {
         TEST_FAIL_MESSAGE("Too many pointers set");
-
-    pointer_store[pointer_index].pointer = pointer;
-    pointer_store[pointer_index].old_value = *pointer;
-    *pointer = newValue;
-    pointer_index++;
+    }
+    else
+    {
+        pointer_store[pointer_index].pointer = pointer;
+        pointer_store[pointer_index].old_value = *pointer;
+        *pointer = newValue;
+        pointer_index++;
+    }
 }
 
 void UnityPointer_UndoAllSets(void)
@@ -306,16 +335,25 @@ void UnityPointer_UndoAllSets(void)
     {
         pointer_index--;
         *(pointer_store[pointer_index].pointer) =
-        pointer_store[pointer_index].old_value;
-
+            pointer_store[pointer_index].old_value;
     }
 }
 
-int UnityFailureCount(void)
+UNITY_COUNTER_TYPE UnityFailureCount(void)
 {
     return Unity.TestFailures;
 }
 
+UNITY_COUNTER_TYPE UnityIgnoreCount(void)
+{
+    return Unity.TestIgnores;
+}
+
+UNITY_COUNTER_TYPE UnityTestsCount(void)
+{
+    return Unity.NumberOfTests;
+}
+
 int UnityGetCommandLineOptions(int argc, const char* argv[])
 {
     int i;
@@ -358,7 +396,13 @@ int UnityGetCommandLineOptions(int argc, const char* argv[])
             {
                 if (*(argv[i]) >= '0' && *(argv[i]) <= '9')
                 {
-                    UnityFixture.RepeatCount = atoi(argv[i]);
+                    unsigned int digit = 0;
+                    UnityFixture.RepeatCount = 0;
+                    while (argv[i][digit] >= '0' && argv[i][digit] <= '9')
+                    {
+                        UnityFixture.RepeatCount *= 10;
+                        UnityFixture.RepeatCount += (unsigned int)argv[i][digit++] - '0';
+                    }
                     i++;
                 }
             }
@@ -376,7 +420,7 @@ void UnityConcludeFixtureTest(void)
     {
         if (UnityFixture.Verbose)
         {
-            UNITY_OUTPUT_CHAR('\n');
+            UNITY_PRINT_EOL();
         }
         Unity.TestIgnores++;
     }
@@ -385,12 +429,13 @@ void UnityConcludeFixtureTest(void)
         if (UnityFixture.Verbose)
         {
             UnityPrint(" PASS");
-            UNITY_OUTPUT_CHAR('\n');
+            UNITY_PRINT_EOL();
         }
     }
     else if (Unity.CurrentTestFailed)
     {
         Unity.TestFailures++;
+        UNITY_PRINT_EOL();
     }
 
     Unity.CurrentTestFailed = 0;

data/vendor/unity/extras/fixture/src/unity_fixture.h

@@ -45,26 +45,18 @@ int UnityMain(int argc, const char* argv[], void (*runAllTests)(void));
     void TEST_##group##_##name##_run(void);\
     void TEST_##group##_##name##_run(void)\
     {\
-        UnityIgnoreTest("IGNORE_TEST(" #group ", " #name ")");\
+        UnityIgnoreTest("IGNORE_TEST(" #group ", " #name ")", TEST_GROUP_##group, #name);\
     }\
     void TEST_##group##_##name##_(void)
 
-#define DECLARE_TEST_CASE(group, name) \
-    void TEST_##group##_##name##_run(void)
-
 #define RUN_TEST_CASE(group, name) \
-    { DECLARE_TEST_CASE(group, name);\
+    { void TEST_##group##_##name##_run(void);\
       TEST_##group##_##name##_run(); }
 
 //This goes at the bottom of each test file or in a separate c file
 #define TEST_GROUP_RUNNER(group)\
-    void TEST_##group##_GROUP_RUNNER_runAll(void);\
     void TEST_##group##_GROUP_RUNNER(void);\
-    void TEST_##group##_GROUP_RUNNER(void)\
-    {\
-        TEST_##group##_GROUP_RUNNER_runAll();\
-    }\
-    void TEST_##group##_GROUP_RUNNER_runAll(void)
+    void TEST_##group##_GROUP_RUNNER(void)
 
 //Call this from main
 #define RUN_TEST_GROUP(group)\
@@ -72,10 +64,10 @@ int UnityMain(int argc, const char* argv[], void (*runAllTests)(void));
       TEST_##group##_GROUP_RUNNER(); }
 
 //CppUTest Compatibility Macros
-#define UT_PTR_SET(ptr, newPointerValue)               UnityPointer_Set((void**)&ptr, (void*)newPointerValue)
-#define TEST_ASSERT_POINTERS_EQUAL(expected, actual)   TEST_ASSERT_EQUAL_PTR(expected, actual)
+#define UT_PTR_SET(ptr, newPointerValue)               UnityPointer_Set((void**)&(ptr), (void*)(newPointerValue))
+#define TEST_ASSERT_POINTERS_EQUAL(expected, actual)   TEST_ASSERT_EQUAL_PTR((expected), (actual))
 #define TEST_ASSERT_BYTES_EQUAL(expected, actual)      TEST_ASSERT_EQUAL_HEX8(0xff & (expected), 0xff & (actual))
-#define FAIL(message)                                  TEST_FAIL((message))
+#define FAIL(message)                                  TEST_FAIL_MESSAGE((message))
 #define CHECK(condition)                               TEST_ASSERT_TRUE((condition))
 #define LONGS_EQUAL(expected, actual)                  TEST_ASSERT_EQUAL_INT((expected), (actual))
 #define STRCMP_EQUAL(expected, actual)                 TEST_ASSERT_EQUAL_STRING((expected), (actual))

data/vendor/unity/extras/fixture/src/unity_fixture_internals.h

@@ -17,28 +17,25 @@ typedef struct _UNITY_FIXTURE_T
 } UNITY_FIXTURE_T;
 
 typedef void unityfunction(void);
-void UnityTestRunner(unityfunction * setup,
-        unityfunction * body,
-        unityfunction * teardown,
-        const char * printableName,
-        const char * group,
-        const char * name,
-        const char * file, int line);
+void UnityTestRunner(unityfunction* setup,
+                     unityfunction* body,
+                     unityfunction* teardown,
+                     const char* printableName,
+                     const char* group,
+                     const char* name,
+                     const char* file, int line);
 
-void UnityIgnoreTest(const char * printableName);
+void UnityIgnoreTest(const char* printableName, const char* group, const char* name);
 void UnityMalloc_StartTest(void);
 void UnityMalloc_EndTest(void);
-int UnityFailureCount(void);
+UNITY_COUNTER_TYPE UnityFailureCount(void);
+UNITY_COUNTER_TYPE UnityIgnoreCount(void);
+UNITY_COUNTER_TYPE UnityTestsCount(void);
 int UnityGetCommandLineOptions(int argc, const char* argv[]);
 void UnityConcludeFixtureTest(void);
 
-void UnityPointer_Set(void ** ptr, void * newValue);
+void UnityPointer_Set(void** ptr, void* newValue);
 void UnityPointer_UndoAllSets(void);
 void UnityPointer_Init(void);
 
-void UnityAssertEqualPointer(const void * expected,
-                            const void * actual,
-                            const char* msg,
-                            const UNITY_LINE_TYPE lineNumber);
-
 #endif /* UNITY_FIXTURE_INTERNALS_H_ */