espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-06-26 03:17:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ran Unity into a source code formatter, no code changes

Browse Source 
Used clang-format, which produces noise on stuff you don't care about
and requires setting it up to match the existing code base. Kept the
potentially useful changes, discarded the rest, some manual tweaking
required. It did catch lots of pesky indentation mistakes.
This commit is contained in:
jsalling
2017-01-18 19:48:40 -06:00
parent 04e10f95ee
commit 97e4bd252a
2 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
extras/fixture/src/unity_fixture.c
View File

@ -5,9 +5,9 @@
* [Released under MIT License. Please refer to license.txt for details] * [Released under MIT License. Please refer to license.txt for details]
* ========================================== */ * ========================================== */
#include <string.h>
#include "unity_fixture.h" #include "unity_fixture.h"
#include "unity_internals.h" #include "unity_internals.h"
#include <string.h>
struct UNITY_FIXTURE_T UnityFixture; struct UNITY_FIXTURE_T UnityFixture;
@ -71,7 +71,8 @@ void UnityTestRunner(unityfunction* setup,
const char* printableName, const char* printableName,
const char* group, const char* group,
const char* name, const char* name,
const char* file, unsigned int line) const char* file,
unsigned int line)
{ {
if (testSelected(name) && groupSelected(group)) if (testSelected(name) && groupSelected(group))
{ {
@ -198,7 +199,7 @@ void* unity_malloc(size_t size)
} }
else else
{ {
guard = (Guard*) &unity_heap[heap_index]; guard = (Guard*)&unity_heap[heap_index];
heap_index += total_size; heap_index += total_size;
} }
#else #else
@ -290,7 +291,7 @@ void* unity_realloc(void* oldMem, size_t size)
if (oldMem == unity_heap + heap_index - guard->size - sizeof(end) && if (oldMem == unity_heap + heap_index - guard->size - sizeof(end) &&
heap_index + size - guard->size <= UNITY_INTERNAL_HEAP_SIZE_BYTES) heap_index + size - guard->size <= UNITY_INTERNAL_HEAP_SIZE_BYTES)
{ {
release_memory(oldMem); /* Not thread-safe, like unity_heap generally */ release_memory(oldMem); /* Not thread-safe, like unity_heap generally */
return unity_malloc(size); /* No memcpy since data is in place */ return unity_malloc(size); /* No memcpy since data is in place */
} }
#endif #endif
@ -395,7 +396,9 @@ int UnityGetCommandLineOptions(int argc, const char* argv[])
i++; i++;
} }
} }
} else { }
else
{
/* ignore unknown parameter */ /* ignore unknown parameter */
i++; i++;
} }

129
src/unity.c
View File

@ -181,8 +181,7 @@ void UnityPrintNumberUnsigned(const UNITY_UINT number)
{ {
UNITY_OUTPUT_CHAR((char)('0' + (number / divisor % 10))); UNITY_OUTPUT_CHAR((char)('0' + (number / divisor % 10)));
divisor /= 10; divisor /= 10;
} } while (divisor > 0);
while (divisor > 0);
} }
/*-----------------------------------------------*/ /*-----------------------------------------------*/
@ -420,7 +419,7 @@ static void UnityPrintExpectedAndActualStrings(const char* expected, const char*
} }
else else
{ {
UnityPrint(UnityStrNull); UnityPrint(UnityStrNull);
} }
UnityPrint(UnityStrWas); UnityPrint(UnityStrWas);
if (actual != NULL) if (actual != NULL)
@ -431,12 +430,14 @@ static void UnityPrintExpectedAndActualStrings(const char* expected, const char*
} }
else else
{ {
UnityPrint(UnityStrNull); UnityPrint(UnityStrNull);
} }
} }
/*-----------------------------------------------*/ /*-----------------------------------------------*/
static void UnityPrintExpectedAndActualStringsLen(const char* expected, const char* actual, const UNITY_UINT32 length) static void UnityPrintExpectedAndActualStringsLen(const char* expected,
const char* actual,
const UNITY_UINT32 length)
{ {
UnityPrint(UnityStrExpected); UnityPrint(UnityStrExpected);
if (expected != NULL) if (expected != NULL)
@ -447,7 +448,7 @@ static void UnityPrintExpectedAndActualStringsLen(const char* expected, const ch
} }
else else
{ {
UnityPrint(UnityStrNull); UnityPrint(UnityStrNull);
} }
UnityPrint(UnityStrWas); UnityPrint(UnityStrWas);
if (actual != NULL) if (actual != NULL)
@ -458,12 +459,10 @@ static void UnityPrintExpectedAndActualStringsLen(const char* expected, const ch
} }
else else
{ {
UnityPrint(UnityStrNull); UnityPrint(UnityStrNull);
} }
} }
/*----------------------------------------------- /*-----------------------------------------------
* Assertion & Control Helpers * Assertion & Control Helpers
*-----------------------------------------------*/ *-----------------------------------------------*/
@ -599,7 +598,7 @@ void UnityAssertEqualIntArray(UNITY_INTERNAL_PTR expected,
if (expect_val != actual_val) if (expect_val != actual_val)
{ {
if (style & UNITY_DISPLAY_RANGE_UINT && length < sizeof expect_val) if (style & UNITY_DISPLAY_RANGE_UINT && length < sizeof(expect_val))
{ /* For UINT, remove sign extension (padding 1's) from signed type casts above */ { /* For UINT, remove sign extension (padding 1's) from signed type casts above */
UNITY_INT mask = 1; UNITY_INT mask = 1;
mask = (mask << 8 * length) - 1; mask = (mask << 8 * length) - 1;
@ -640,12 +639,11 @@ void UnityAssertEqualIntArray(UNITY_INTERNAL_PTR expected,
#ifndef UNITY_EXCLUDE_FLOAT_PRINT #ifndef UNITY_EXCLUDE_FLOAT_PRINT
#define UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT(expected, actual) \ #define UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT(expected, actual) \
do { \ { \
UnityPrint(UnityStrExpected); \ UnityPrint(UnityStrExpected); \
UnityPrintFloat(expected); \ UnityPrintFloat(expected); \
UnityPrint(UnityStrWas); \ UnityPrint(UnityStrWas); \
UnityPrintFloat(actual); \ UnityPrintFloat(actual); }
} while(0)
#else #else
#define UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT(expected, actual) \ #define UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT(expected, actual) \
UnityPrint(UnityStrDelta) UnityPrint(UnityStrDelta)
@ -719,14 +717,14 @@ void UnityAssertFloatSpecial(const UNITY_FLOAT actual,
const UNITY_LINE_TYPE lineNumber, const UNITY_LINE_TYPE lineNumber,
const UNITY_FLOAT_TRAIT_T style) const UNITY_FLOAT_TRAIT_T style)
{ {
const char* trait_names[] = { UnityStrInf, UnityStrNegInf, UnityStrNaN, UnityStrDet }; const char* trait_names[] = {UnityStrInf, UnityStrNegInf, UnityStrNaN, UnityStrDet};
UNITY_INT should_be_trait = ((UNITY_INT)style & 1); UNITY_INT should_be_trait = ((UNITY_INT)style & 1);
UNITY_INT is_trait = !should_be_trait; UNITY_INT is_trait = !should_be_trait;
UNITY_INT trait_index = (UNITY_INT)(style >> 1); UNITY_INT trait_index = (UNITY_INT)(style >> 1);
RETURN_IF_FAIL_OR_IGNORE; RETURN_IF_FAIL_OR_IGNORE;
switch(style) switch (style)
{ {
case UNITY_FLOAT_IS_INF: case UNITY_FLOAT_IS_INF:
case UNITY_FLOAT_IS_NOT_INF: case UNITY_FLOAT_IS_NOT_INF:
@ -845,14 +843,14 @@ void UnityAssertDoubleSpecial(const UNITY_DOUBLE actual,
const UNITY_LINE_TYPE lineNumber, const UNITY_LINE_TYPE lineNumber,
const UNITY_FLOAT_TRAIT_T style) const UNITY_FLOAT_TRAIT_T style)
{ {
const char* trait_names[] = { UnityStrInf, UnityStrNegInf, UnityStrNaN, UnityStrDet }; const char* trait_names[] = {UnityStrInf, UnityStrNegInf, UnityStrNaN, UnityStrDet};
UNITY_INT should_be_trait = ((UNITY_INT)style & 1); UNITY_INT should_be_trait = ((UNITY_INT)style & 1);
UNITY_INT is_trait = !should_be_trait; UNITY_INT is_trait = !should_be_trait;
UNITY_INT trait_index = (UNITY_INT)(style >> 1); UNITY_INT trait_index = (UNITY_INT)(style >> 1);
RETURN_IF_FAIL_OR_IGNORE; RETURN_IF_FAIL_OR_IGNORE;
switch(style) switch (style)
{ {
case UNITY_FLOAT_IS_INF: case UNITY_FLOAT_IS_INF:
case UNITY_FLOAT_IS_NOT_INF: case UNITY_FLOAT_IS_NOT_INF:
@ -899,16 +897,15 @@ void UnityAssertDoubleSpecial(const UNITY_DOUBLE actual,
} }
} }
#endif /* not UNITY_EXCLUDE_DOUBLE */ #endif /* not UNITY_EXCLUDE_DOUBLE */
/*-----------------------------------------------*/ /*-----------------------------------------------*/
void UnityAssertNumbersWithin( const UNITY_UINT delta, void UnityAssertNumbersWithin(const UNITY_UINT delta,
const UNITY_INT expected, const UNITY_INT expected,
const UNITY_INT actual, const UNITY_INT actual,
const char* msg, const char* msg,
const UNITY_LINE_TYPE lineNumber, const UNITY_LINE_TYPE lineNumber,
const UNITY_DISPLAY_STYLE_T style) const UNITY_DISPLAY_STYLE_T style)
{ {
RETURN_IF_FAIL_OR_IGNORE; RETURN_IF_FAIL_OR_IGNORE;
@ -973,19 +970,19 @@ void UnityAssertEqualString(const char* expected,
if (Unity.CurrentTestFailed) if (Unity.CurrentTestFailed)
{ {
UnityTestResultsFailBegin(lineNumber); UnityTestResultsFailBegin(lineNumber);
UnityPrintExpectedAndActualStrings(expected, actual); UnityPrintExpectedAndActualStrings(expected, actual);
UnityAddMsgIfSpecified(msg); UnityAddMsgIfSpecified(msg);
UNITY_FAIL_AND_BAIL; UNITY_FAIL_AND_BAIL;
} }
} }
/*-----------------------------------------------*/ /*-----------------------------------------------*/
void UnityAssertEqualStringLen(const char* expected, void UnityAssertEqualStringLen(const char* expected,
const char* actual, const char* actual,
const UNITY_UINT32 length, const UNITY_UINT32 length,
const char* msg, const char* msg,
const UNITY_LINE_TYPE lineNumber) const UNITY_LINE_TYPE lineNumber)
{ {
UNITY_UINT32 i; UNITY_UINT32 i;
@ -1013,20 +1010,19 @@ void UnityAssertEqualStringLen(const char* expected,
if (Unity.CurrentTestFailed) if (Unity.CurrentTestFailed)
{ {
UnityTestResultsFailBegin(lineNumber); UnityTestResultsFailBegin(lineNumber);
UnityPrintExpectedAndActualStringsLen(expected, actual, length); UnityPrintExpectedAndActualStringsLen(expected, actual, length);
UnityAddMsgIfSpecified(msg); UnityAddMsgIfSpecified(msg);
UNITY_FAIL_AND_BAIL; UNITY_FAIL_AND_BAIL;
} }
} }
/*-----------------------------------------------*/ /*-----------------------------------------------*/
void UnityAssertEqualStringArray( const char** expected, void UnityAssertEqualStringArray(const char** expected,
const char** actual, const char** actual,
const UNITY_UINT32 num_elements, const UNITY_UINT32 num_elements,
const char* msg, const char* msg,
const UNITY_LINE_TYPE lineNumber) const UNITY_LINE_TYPE lineNumber)
{ {
UNITY_UINT32 i, j = 0; UNITY_UINT32 i, j = 0;
@ -1080,12 +1076,12 @@ void UnityAssertEqualStringArray( const char** expected,
} }
/*-----------------------------------------------*/ /*-----------------------------------------------*/
void UnityAssertEqualMemory( UNITY_INTERNAL_PTR expected, void UnityAssertEqualMemory(UNITY_INTERNAL_PTR expected,
UNITY_INTERNAL_PTR actual, UNITY_INTERNAL_PTR actual,
const UNITY_UINT32 length, const UNITY_UINT32 length,
const UNITY_UINT32 num_elements, const UNITY_UINT32 num_elements,
const char* msg, const char* msg,
const UNITY_LINE_TYPE lineNumber) const UNITY_LINE_TYPE lineNumber)
{ {
UNITY_PTR_ATTRIBUTE const unsigned char* ptr_exp = (UNITY_PTR_ATTRIBUTE const unsigned char*)expected; UNITY_PTR_ATTRIBUTE const unsigned char* ptr_exp = (UNITY_PTR_ATTRIBUTE const unsigned char*)expected;
UNITY_PTR_ATTRIBUTE const unsigned char* ptr_act = (UNITY_PTR_ATTRIBUTE const unsigned char*)actual; UNITY_PTR_ATTRIBUTE const unsigned char* ptr_act = (UNITY_PTR_ATTRIBUTE const unsigned char*)actual;
@ -1178,22 +1174,22 @@ void UnityIgnore(const char* msg, const UNITY_LINE_TYPE line)
UnityPrint(UnityStrIgnore); UnityPrint(UnityStrIgnore);
if (msg != NULL) if (msg != NULL)
{ {
UNITY_OUTPUT_CHAR(':'); UNITY_OUTPUT_CHAR(':');
UNITY_OUTPUT_CHAR(' '); UNITY_OUTPUT_CHAR(' ');
UnityPrint(msg); UnityPrint(msg);
} }
UNITY_IGNORE_AND_BAIL; UNITY_IGNORE_AND_BAIL;
} }
/*-----------------------------------------------*/ /*-----------------------------------------------*/
#if defined(UNITY_WEAK_ATTRIBUTE) #if defined(UNITY_WEAK_ATTRIBUTE)
UNITY_WEAK_ATTRIBUTE void setUp(void) { } UNITY_WEAK_ATTRIBUTE void setUp(void) { }
UNITY_WEAK_ATTRIBUTE void tearDown(void) { } UNITY_WEAK_ATTRIBUTE void tearDown(void) { }
#elif defined(UNITY_WEAK_PRAGMA) #elif defined(UNITY_WEAK_PRAGMA)
# pragma weak setUp #pragma weak setUp
void setUp(void) { } void setUp(void) { }
# pragma weak tearDown #pragma weak tearDown
void tearDown(void) { } void tearDown(void) { }
#endif #endif
/*-----------------------------------------------*/ /*-----------------------------------------------*/
void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum) void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum)
@ -1267,7 +1263,7 @@ int UnityEnd(void)
char* UnityOptionIncludeNamed = NULL; char* UnityOptionIncludeNamed = NULL;
char* UnityOptionExcludeNamed = NULL; char* UnityOptionExcludeNamed = NULL;
int UnityVerbosity = 1; int UnityVerbosity = 1;
int UnityParseOptions(int argc, char** argv) int UnityParseOptions(int argc, char** argv)
{ {
@ -1278,7 +1274,7 @@ int UnityParseOptions(int argc, char** argv)
{ {
if (argv[i][0] == '-') if (argv[i][0] == '-')
{ {
switch(argv[i][1]) switch (argv[i][1])
{ {
case 'l': /* list tests */ case 'l': /* list tests */
return -1; return -1;
@ -1383,7 +1379,8 @@ int UnityStringArgumentMatches(const char* str)
/* look for the start of the next partial */ /* look for the start of the next partial */
ptr2 = ptr1; ptr2 = ptr1;
ptrf = 0; ptrf = 0;
do { do
{
ptr2++; ptr2++;
if ((ptr2[0] == ':') && (ptr2[1] != 0) && (ptr2[0] != '\'') && (ptr2[0] != '"') && (ptr2[0] != ',')) if ((ptr2[0] == ':') && (ptr2[1] != 0) && (ptr2[0] != '\'') && (ptr2[0] != '"') && (ptr2[0] != ','))
ptrf = &ptr2[1]; ptrf = &ptr2[1];