Change example_1 to compile with std=c89

This commit is contained in:
Andrzej Bieniek
2015-09-09 21:13:33 +01:00
parent 61dd3f181b
commit 83f7d5237b
7 changed files with 36 additions and 36 deletions

View File

@ -26,7 +26,7 @@ endif
UNITY_ROOT=../.. UNITY_ROOT=../..
C_COMPILER=gcc C_COMPILER=gcc
CFLAGS=-std=c99 CFLAGS=-std=c89
CFLAGS += -Wall CFLAGS += -Wall
CFLAGS += -Wextra CFLAGS += -Wextra
CFLAGS += -Werror CFLAGS += -Werror

View File

@ -2,18 +2,18 @@
#include "ProductionCode.h" #include "ProductionCode.h"
int Counter = 0; int Counter = 0;
int NumbersToFind[9] = { 0, 34, 55, 66, 32, 11, 1, 77, 888 }; //some obnoxious array to search that is 1-based indexing instead of 0. int NumbersToFind[9] = { 0, 34, 55, 66, 32, 11, 1, 77, 888 }; /* some obnoxious array to search that is 1-based indexing instead of 0. */
// This function is supposed to search through NumbersToFind and find a particular number. /* This function is supposed to search through NumbersToFind and find a particular number.
// If it finds it, the index is returned. Otherwise 0 is returned which sorta makes sense since * If it finds it, the index is returned. Otherwise 0 is returned which sorta makes sense since
// NumbersToFind is indexed from 1. Unfortunately it's broken * NumbersToFind is indexed from 1. Unfortunately it's broken
// (and should therefore be caught by our tests) * (and should therefore be caught by our tests) */
int FindFunction_WhichIsBroken(int NumberToFind) int FindFunction_WhichIsBroken(int NumberToFind)
{ {
int i = 0; int i = 0;
while (i <= 8) //Notice I should have been in braces while (i <= 8) /* Notice I should have been in braces */
i++; i++;
if (NumbersToFind[i] == NumberToFind) //Yikes! I'm getting run after the loop finishes instead of during it! if (NumbersToFind[i] == NumberToFind) /* Yikes! I'm getting run after the loop finishes instead of during it! */
return i; return i;
return 0; return 0;
} }

View File

@ -5,7 +5,7 @@ char* ThisFunctionHasNotBeenTested(int Poor, char* LittleFunction)
{ {
(void)Poor; (void)Poor;
(void)LittleFunction; (void)LittleFunction;
//Since There Are No Tests Yet, This Function Could Be Empty For All We Know. /* Since There Are No Tests Yet, This Function Could Be Empty For All We Know.
// Which isn't terribly useful... but at least we put in a TEST_IGNORE so we won't forget * Which isn't terribly useful... but at least we put in a TEST_IGNORE so we won't forget */
return (char*)0; return (char*)0;
} }

View File

@ -2,14 +2,14 @@
#include "ProductionCode.h" #include "ProductionCode.h"
#include "unity.h" #include "unity.h"
//sometimes you may want to get at local data in a module. /* sometimes you may want to get at local data in a module.
//for example: If you plan to pass by reference, this could be useful * for example: If you plan to pass by reference, this could be useful
//however, it should often be avoided * however, it should often be avoided */
extern int Counter; extern int Counter;
void setUp(void) void setUp(void)
{ {
//This is run before EACH TEST /* This is run before EACH TEST */
Counter = 0x5a5a; Counter = 0x5a5a;
} }
@ -19,7 +19,7 @@ void tearDown(void)
void test_FindFunction_WhichIsBroken_ShouldReturnZeroIfItemIsNotInList_WhichWorksEvenInOurBrokenCode(void) void test_FindFunction_WhichIsBroken_ShouldReturnZeroIfItemIsNotInList_WhichWorksEvenInOurBrokenCode(void)
{ {
//All of these should pass /* All of these should pass */
TEST_ASSERT_EQUAL(0, FindFunction_WhichIsBroken(78)); TEST_ASSERT_EQUAL(0, FindFunction_WhichIsBroken(78));
TEST_ASSERT_EQUAL(0, FindFunction_WhichIsBroken(1)); TEST_ASSERT_EQUAL(0, FindFunction_WhichIsBroken(1));
TEST_ASSERT_EQUAL(0, FindFunction_WhichIsBroken(33)); TEST_ASSERT_EQUAL(0, FindFunction_WhichIsBroken(33));
@ -29,34 +29,34 @@ void test_FindFunction_WhichIsBroken_ShouldReturnZeroIfItemIsNotInList_WhichWork
void test_FindFunction_WhichIsBroken_ShouldReturnTheIndexForItemsInList_WhichWillFailBecauseOurFunctionUnderTestIsBroken(void) void test_FindFunction_WhichIsBroken_ShouldReturnTheIndexForItemsInList_WhichWillFailBecauseOurFunctionUnderTestIsBroken(void)
{ {
// You should see this line fail in your test summary /* You should see this line fail in your test summary */
TEST_ASSERT_EQUAL(1, FindFunction_WhichIsBroken(34)); TEST_ASSERT_EQUAL(1, FindFunction_WhichIsBroken(34));
// Notice the rest of these didn't get a chance to run because the line above failed. /* Notice the rest of these didn't get a chance to run because the line above failed.
// Unit tests abort each test function on the first sign of trouble. * Unit tests abort each test function on the first sign of trouble.
// Then NEXT test function runs as normal. * Then NEXT test function runs as normal. */
TEST_ASSERT_EQUAL(8, FindFunction_WhichIsBroken(8888)); TEST_ASSERT_EQUAL(8, FindFunction_WhichIsBroken(8888));
} }
void test_FunctionWhichReturnsLocalVariable_ShouldReturnTheCurrentCounterValue(void) void test_FunctionWhichReturnsLocalVariable_ShouldReturnTheCurrentCounterValue(void)
{ {
//This should be true because setUp set this up for us before this test /* This should be true because setUp set this up for us before this test */
TEST_ASSERT_EQUAL_HEX(0x5a5a, FunctionWhichReturnsLocalVariable()); TEST_ASSERT_EQUAL_HEX(0x5a5a, FunctionWhichReturnsLocalVariable());
//This should be true because we can still change our answer /* This should be true because we can still change our answer */
Counter = 0x1234; Counter = 0x1234;
TEST_ASSERT_EQUAL_HEX(0x1234, FunctionWhichReturnsLocalVariable()); TEST_ASSERT_EQUAL_HEX(0x1234, FunctionWhichReturnsLocalVariable());
} }
void test_FunctionWhichReturnsLocalVariable_ShouldReturnTheCurrentCounterValueAgain(void) void test_FunctionWhichReturnsLocalVariable_ShouldReturnTheCurrentCounterValueAgain(void)
{ {
//This should be true again because setup was rerun before this test (and after we changed it to 0x1234) /* This should be true again because setup was rerun before this test (and after we changed it to 0x1234) */
TEST_ASSERT_EQUAL_HEX(0x5a5a, FunctionWhichReturnsLocalVariable()); TEST_ASSERT_EQUAL_HEX(0x5a5a, FunctionWhichReturnsLocalVariable());
} }
void test_FunctionWhichReturnsLocalVariable_ShouldReturnCurrentCounter_ButFailsBecauseThisTestIsActuallyFlawed(void) void test_FunctionWhichReturnsLocalVariable_ShouldReturnCurrentCounter_ButFailsBecauseThisTestIsActuallyFlawed(void)
{ {
//Sometimes you get the test wrong. When that happens, you get a failure too... and a quick look should tell /* Sometimes you get the test wrong. When that happens, you get a failure too... and a quick look should tell
// you what actually happened...which in this case was a failure to setup the initial condition. * you what actually happened...which in this case was a failure to setup the initial condition. */
TEST_ASSERT_EQUAL_HEX(0x1234, FunctionWhichReturnsLocalVariable()); TEST_ASSERT_EQUAL_HEX(0x1234, FunctionWhichReturnsLocalVariable());
} }

View File

@ -4,8 +4,8 @@
/* These should be ignored because they are commented out in various ways: /* These should be ignored because they are commented out in various ways:
#include "whatever.h" #include "whatever.h"
#include "somethingelse.h"
*/ */
//#include "somethingelse.h"
void setUp(void) void setUp(void)
{ {
@ -27,5 +27,5 @@ void test_AnotherIgnoredTest(void)
void test_ThisFunctionHasNotBeenTested_NeedsToBeImplemented(void) void test_ThisFunctionHasNotBeenTested_NeedsToBeImplemented(void)
{ {
TEST_IGNORE(); //Like This TEST_IGNORE(); /* Like This */
} }

View File

@ -1,6 +1,6 @@
/* AUTOGENERATED FILE. DO NOT EDIT. */ /* AUTOGENERATED FILE. DO NOT EDIT. */
//=======Test Runner Used To Run Each Test Below===== /*=======Test Runner Used To Run Each Test Below=====*/
#define RUN_TEST(TestFunc, TestLineNum) \ #define RUN_TEST(TestFunc, TestLineNum) \
{ \ { \
Unity.CurrentTestName = #TestFunc; \ Unity.CurrentTestName = #TestFunc; \
@ -18,13 +18,13 @@
UnityConcludeTest(); \ UnityConcludeTest(); \
} }
//=======Automagically Detected Files To Include===== /*=======Automagically Detected Files To Include=====*/
#include "unity.h" #include "unity.h"
#include <setjmp.h> #include <setjmp.h>
#include <stdio.h> #include <stdio.h>
#include "ProductionCode2.h" #include "ProductionCode2.h"
//=======External Functions This Runner Calls===== /*=======External Functions This Runner Calls=====*/
extern void setUp(void); extern void setUp(void);
extern void tearDown(void); extern void tearDown(void);
extern void test_IgnoredTest(void); extern void test_IgnoredTest(void);
@ -32,7 +32,7 @@ extern void test_AnotherIgnoredTest(void);
extern void test_ThisFunctionHasNotBeenTested_NeedsToBeImplemented(void); extern void test_ThisFunctionHasNotBeenTested_NeedsToBeImplemented(void);
//=======Test Reset Option===== /*=======Test Reset Option=====*/
void resetTest(void); void resetTest(void);
void resetTest(void) void resetTest(void)
{ {
@ -41,7 +41,7 @@ void resetTest(void)
} }
//=======MAIN===== /*=======MAIN=====*/
int main(void) int main(void)
{ {
UnityBegin("test/TestProductionCode2.c"); UnityBegin("test/TestProductionCode2.c");

View File

@ -1,6 +1,6 @@
/* AUTOGENERATED FILE. DO NOT EDIT. */ /* AUTOGENERATED FILE. DO NOT EDIT. */
//=======Test Runner Used To Run Each Test Below===== /*=======Test Runner Used To Run Each Test Below=====*/
#define RUN_TEST(TestFunc, TestLineNum) \ #define RUN_TEST(TestFunc, TestLineNum) \
{ \ { \
Unity.CurrentTestName = #TestFunc; \ Unity.CurrentTestName = #TestFunc; \
@ -18,13 +18,13 @@
UnityConcludeTest(); \ UnityConcludeTest(); \
} }
//=======Automagically Detected Files To Include===== /*=======Automagically Detected Files To Include=====*/
#include "unity.h" #include "unity.h"
#include <setjmp.h> #include <setjmp.h>
#include <stdio.h> #include <stdio.h>
#include "ProductionCode.h" #include "ProductionCode.h"
//=======External Functions This Runner Calls===== /*=======External Functions This Runner Calls=====*/
extern void setUp(void); extern void setUp(void);
extern void tearDown(void); extern void tearDown(void);
extern void test_FindFunction_WhichIsBroken_ShouldReturnZeroIfItemIsNotInList_WhichWorksEvenInOurBrokenCode(void); extern void test_FindFunction_WhichIsBroken_ShouldReturnZeroIfItemIsNotInList_WhichWorksEvenInOurBrokenCode(void);
@ -34,7 +34,7 @@ extern void test_FunctionWhichReturnsLocalVariable_ShouldReturnTheCurrentCounter
extern void test_FunctionWhichReturnsLocalVariable_ShouldReturnCurrentCounter_ButFailsBecauseThisTestIsActuallyFlawed(void); extern void test_FunctionWhichReturnsLocalVariable_ShouldReturnCurrentCounter_ButFailsBecauseThisTestIsActuallyFlawed(void);
//=======Test Reset Option===== /*=======Test Reset Option=====*/
void resetTest(void); void resetTest(void);
void resetTest(void) void resetTest(void)
{ {
@ -43,7 +43,7 @@ void resetTest(void)
} }
//=======MAIN===== /*=======MAIN=====*/
int main(void) int main(void)
{ {
UnityBegin("test/TestProductionCode.c"); UnityBegin("test/TestProductionCode.c");