提交 4a145c10 编写于 作者: M Mark VanderVoord

reworked character strings to be an array type so that storage classes are...

reworked character strings to be an array type so that storage classes are handled better for picky compilers.
上级 2fef6ea5
...@@ -14,26 +14,34 @@ ...@@ -14,26 +14,34 @@
struct _Unity Unity; struct _Unity Unity;
const char* UnityStrNull = "NULL"; const char UnityStrOk[] = "OK";
const char* UnityStrSpacer = ". "; const char UnityStrPass[] = "PASS";
const char* UnityStrExpected = " Expected "; const char UnityStrFail[] = "FAIL";
const char* UnityStrWas = " Was "; const char UnityStrIgnore[] = "IGNORE";
const char* UnityStrTo = " To "; const char UnityStrNull[] = "NULL";
const char* UnityStrElement = " Element "; const char UnityStrSpacer[] = ". ";
const char* UnityStrByte = " Byte "; const char UnityStrExpected[] = " Expected ";
const char* UnityStrMemory = " Memory Mismatch."; const char UnityStrWas[] = " Was ";
const char* UnityStrDelta = " Values Not Within Delta "; const char UnityStrTo[] = " To ";
const char* UnityStrPointless= " You Asked Me To Compare Nothing, Which Was Pointless."; const char UnityStrElement[] = " Element ";
const char* UnityStrNullPointerForExpected= " Expected pointer to be NULL"; const char UnityStrByte[] = " Byte ";
const char* UnityStrNullPointerForActual = " Actual pointer was NULL"; const char UnityStrMemory[] = " Memory Mismatch.";
const char* UnityStrNot = "Not "; const char UnityStrDelta[] = " Values Not Within Delta ";
const char* UnityStrInf = "Infinity"; const char UnityStrPointless[] = " You Asked Me To Compare Nothing, Which Was Pointless.";
const char* UnityStrNegInf = "Negative Infinity"; const char UnityStrNullPointerForExpected[] = " Expected pointer to be NULL";
const char* UnityStrNaN = "NaN"; const char UnityStrNullPointerForActual[] = " Actual pointer was NULL";
const char* UnityStrDet = "Determinate"; const char UnityStrNot[] = "Not ";
const char* UnityStrErrFloat = "Unity Floating Point Disabled"; const char UnityStrInf[] = "Infinity";
const char* UnityStrErrDouble= "Unity Double Precision Disabled"; const char UnityStrNegInf[] = "Negative Infinity";
const char* UnityStrErr64 = "Unity 64-bit Support Disabled"; const char UnityStrNaN[] = "NaN";
const char UnityStrDet[] = "Determinate";
const char UnityStrErrFloat[] = "Unity Floating Point Disabled";
const char UnityStrErrDouble[] = "Unity Double Precision Disabled";
const char UnityStrErr64[] = "Unity 64-bit Support Disabled";
const char UnityStrBreaker[] = "-----------------------";
const char UnityStrResultsTests[] = " Tests ";
const char UnityStrResultsFailures[] = " Failures ";
const char UnityStrResultsIgnored[] = " Ignored ";
#ifndef UNITY_EXCLUDE_FLOAT #ifndef UNITY_EXCLUDE_FLOAT
// Dividing by these constants produces +/- infinity. // Dividing by these constants produces +/- infinity.
...@@ -254,12 +262,12 @@ void UnityPrintFloat(_UF number) ...@@ -254,12 +262,12 @@ void UnityPrintFloat(_UF number)
void UnityPrintFail(void) void UnityPrintFail(void)
{ {
UnityPrint("FAIL"); UnityPrint(UnityStrFail);
} }
void UnityPrintOk(void) void UnityPrintOk(void)
{ {
UnityPrint("OK"); UnityPrint(UnityStrOk);
} }
//----------------------------------------------- //-----------------------------------------------
...@@ -278,7 +286,8 @@ void UnityTestResultsBegin(const char* file, const UNITY_LINE_TYPE line) ...@@ -278,7 +286,8 @@ void UnityTestResultsBegin(const char* file, const UNITY_LINE_TYPE line)
void UnityTestResultsFailBegin(const UNITY_LINE_TYPE line) void UnityTestResultsFailBegin(const UNITY_LINE_TYPE line)
{ {
UnityTestResultsBegin(Unity.TestFile, line); UnityTestResultsBegin(Unity.TestFile, line);
UnityPrint("FAIL:"); UnityPrint(UnityStrFail);
UNITY_OUTPUT_CHAR(':');
} }
//----------------------------------------------- //-----------------------------------------------
...@@ -291,7 +300,7 @@ void UnityConcludeTest(void) ...@@ -291,7 +300,7 @@ void UnityConcludeTest(void)
else if (!Unity.CurrentTestFailed) else if (!Unity.CurrentTestFailed)
{ {
UnityTestResultsBegin(Unity.TestFile, Unity.CurrentTestLineNumber); UnityTestResultsBegin(Unity.TestFile, Unity.CurrentTestLineNumber);
UnityPrint("PASS"); UnityPrint(UnityStrPass);
} }
else else
{ {
...@@ -1077,7 +1086,7 @@ void UnityIgnore(const char* msg, const UNITY_LINE_TYPE line) ...@@ -1077,7 +1086,7 @@ void UnityIgnore(const char* msg, const UNITY_LINE_TYPE line)
UNITY_SKIP_EXECUTION; UNITY_SKIP_EXECUTION;
UnityTestResultsBegin(Unity.TestFile, line); UnityTestResultsBegin(Unity.TestFile, line);
UnityPrint("IGNORE"); UnityPrint(UnityStrIgnore);
if (msg != NULL) if (msg != NULL)
{ {
UNITY_OUTPUT_CHAR(':'); UNITY_OUTPUT_CHAR(':');
...@@ -1132,14 +1141,14 @@ void UnityBegin(const char* filename) ...@@ -1132,14 +1141,14 @@ void UnityBegin(const char* filename)
int UnityEnd(void) int UnityEnd(void)
{ {
UNITY_PRINT_EOL; UNITY_PRINT_EOL;
UnityPrint("-----------------------"); UnityPrint(UnityStrBreaker);
UNITY_PRINT_EOL; UNITY_PRINT_EOL;
UnityPrintNumber((_U_SINT)(Unity.NumberOfTests)); UnityPrintNumber((_U_SINT)(Unity.NumberOfTests));
UnityPrint(" Tests "); UnityPrint(UnityStrResultsTests);
UnityPrintNumber((_U_SINT)(Unity.TestFailures)); UnityPrintNumber((_U_SINT)(Unity.TestFailures));
UnityPrint(" Failures "); UnityPrint(UnityStrResultsFailures);
UnityPrintNumber((_U_SINT)(Unity.TestIgnores)); UnityPrintNumber((_U_SINT)(Unity.TestIgnores));
UnityPrint(" Ignored"); UnityPrint(UnityStrResultsIgnored);
UNITY_PRINT_EOL; UNITY_PRINT_EOL;
if (Unity.TestFailures == 0U) if (Unity.TestFailures == 0U)
{ {
......
...@@ -509,9 +509,9 @@ void UnityAssertDoubleSpecial(const _UD actual, ...@@ -509,9 +509,9 @@ void UnityAssertDoubleSpecial(const _UD actual,
// Error Strings We Might Need // Error Strings We Might Need
//------------------------------------------------------- //-------------------------------------------------------
extern const char* UnityStrErrFloat; extern const char UnityStrErrFloat[];
extern const char* UnityStrErrDouble; extern const char UnityStrErrDouble[];
extern const char* UnityStrErr64; extern const char UnityStrErr64[];
//------------------------------------------------------- //-------------------------------------------------------
// Test Running Macros // Test Running Macros
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册