3rd-party/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-01-23 08:25:58 +01:00
Code Issues Releases Wiki Activity

Merge pull request #65 from ThrowTheSwitch/bug/init

Browse Source 
Fixed initialization of data structure
This commit is contained in:
Mark VanderVoord
2014-03-07 15:18:56 -05:00
parent 291c2980e0 f1c778e100
commit 4d2c2a5e82
18 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
auto/generate_test_runner.rb
View File

@@ -266,8 +266,8 @@ class UnityTestRunnerGenerator
output.puts("int main(void)")
output.puts("{")
output.puts(" suite_setup();") unless @options[:suite_setup].nil?
output.puts(" Unity.TestFile = \"#{filename}\";")
output.puts(" UnityBegin();")
output.puts(" Unity.TestFile = \"#{filename}\";")
if (@options[:use_param_tests])
tests.each do |test|
if ((test[:args].nil?) or (test[:args].empty?))

5
src/unity.c
View File

@@ -14,7 +14,7 @@
#define UNITY_SKIP_EXECUTION { if ((Unity.CurrentTestFailed != 0) || (Unity.CurrentTestIgnored != 0)) {return;} }
#define UNITY_PRINT_EOL { UNITY_OUTPUT_CHAR('\n'); }
struct _Unity Unity = { 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , {{{ 0 }}} };
struct _Unity Unity;
const char* UnityStrNull = "NULL";
const char* UnityStrSpacer = ". ";
@@ -1115,6 +1115,9 @@ void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int
//-----------------------------------------------
void UnityBegin(void)
{
Unity.TestFile = NULL;
Unity.CurrentTestName = NULL;
Unity.CurrentTestLineNumber = 0;
Unity.NumberOfTests = 0;
Unity.TestFailures = 0;
Unity.TestIgnores = 0;

2
test/expectdata/testsample_cmd.c
View File

@@ -48,8 +48,8 @@ void resetTest()
//=======MAIN=====
int main(void)
{
Unity.TestFile = "test/testdata/testsample.c";
UnityBegin();
Unity.TestFile = "test/testdata/testsample.c";
RUN_TEST(test_TheFirstThingToTest, 21);
RUN_TEST(test_TheSecondThingToTest, 43);

2
test/expectdata/testsample_def.c
View File

@@ -44,8 +44,8 @@ void resetTest()
//=======MAIN=====
int main(void)
{
Unity.TestFile = "test/testdata/testsample.c";
UnityBegin();
Unity.TestFile = "test/testdata/testsample.c";
RUN_TEST(test_TheFirstThingToTest, 21);
RUN_TEST(test_TheSecondThingToTest, 43);

2
test/expectdata/testsample_mock_cmd.c
View File

@@ -69,8 +69,8 @@ void resetTest()
//=======MAIN=====
int main(void)
{
Unity.TestFile = "test/testdata/mocksample.c";
UnityBegin();
Unity.TestFile = "test/testdata/mocksample.c";
RUN_TEST(test_TheFirstThingToTest, 21);
RUN_TEST(test_TheSecondThingToTest, 43);

2
test/expectdata/testsample_mock_def.c
View File

@@ -65,8 +65,8 @@ void resetTest()
//=======MAIN=====
int main(void)
{
Unity.TestFile = "test/testdata/mocksample.c";
UnityBegin();
Unity.TestFile = "test/testdata/mocksample.c";
RUN_TEST(test_TheFirstThingToTest, 21);
RUN_TEST(test_TheSecondThingToTest, 43);

2
test/expectdata/testsample_mock_new1.c
View File

@@ -78,8 +78,8 @@ void resetTest()
//=======MAIN=====
int main(void)
{
Unity.TestFile = "test/testdata/mocksample.c";
UnityBegin();
Unity.TestFile = "test/testdata/mocksample.c";
RUN_TEST(test_TheFirstThingToTest, 21);
RUN_TEST(test_TheSecondThingToTest, 43);

2
test/expectdata/testsample_mock_new2.c
View File

@@ -78,8 +78,8 @@ void resetTest()
int main(void)
{
suite_setup();
Unity.TestFile = "test/testdata/mocksample.c";
UnityBegin();
Unity.TestFile = "test/testdata/mocksample.c";
RUN_TEST(test_TheFirstThingToTest, 21);
RUN_TEST(test_TheSecondThingToTest, 43);

2
test/expectdata/testsample_mock_param.c
View File

@@ -66,8 +66,8 @@ void resetTest()
//=======MAIN=====
int main(void)
{
Unity.TestFile = "test/testdata/mocksample.c";
UnityBegin();
Unity.TestFile = "test/testdata/mocksample.c";
RUN_TEST(test_TheFirstThingToTest, 21, RUN_TEST_NO_ARGS);
RUN_TEST(test_TheSecondThingToTest, 43, RUN_TEST_NO_ARGS);

2
test/expectdata/testsample_mock_run1.c
View File

@@ -78,8 +78,8 @@ void resetTest()
//=======MAIN=====
int main(void)
{
Unity.TestFile = "test/testdata/mocksample.c";
UnityBegin();
Unity.TestFile = "test/testdata/mocksample.c";
RUN_TEST(test_TheFirstThingToTest, 21);
RUN_TEST(test_TheSecondThingToTest, 43);

2
test/expectdata/testsample_mock_run2.c
View File

@@ -78,8 +78,8 @@ void resetTest()
int main(void)
{
suite_setup();
Unity.TestFile = "test/testdata/mocksample.c";
UnityBegin();
Unity.TestFile = "test/testdata/mocksample.c";
RUN_TEST(test_TheFirstThingToTest, 21);
RUN_TEST(test_TheSecondThingToTest, 43);

2
test/expectdata/testsample_mock_yaml.c
View File

@@ -79,8 +79,8 @@ void resetTest()
int main(void)
{
suite_setup();
Unity.TestFile = "test/testdata/mocksample.c";
UnityBegin();
Unity.TestFile = "test/testdata/mocksample.c";
RUN_TEST(test_TheFirstThingToTest, 21);
RUN_TEST(test_TheSecondThingToTest, 43);

2
test/expectdata/testsample_new1.c
View File

@@ -54,8 +54,8 @@ void resetTest()
//=======MAIN=====
int main(void)
{
Unity.TestFile = "test/testdata/testsample.c";
UnityBegin();
Unity.TestFile = "test/testdata/testsample.c";
RUN_TEST(test_TheFirstThingToTest, 21);
RUN_TEST(test_TheSecondThingToTest, 43);

2
test/expectdata/testsample_new2.c
View File

@@ -57,8 +57,8 @@ void resetTest()
int main(void)
{
suite_setup();
Unity.TestFile = "test/testdata/testsample.c";
UnityBegin();
Unity.TestFile = "test/testdata/testsample.c";
RUN_TEST(test_TheFirstThingToTest, 21);
RUN_TEST(test_TheSecondThingToTest, 43);

2
test/expectdata/testsample_param.c
View File

@@ -45,8 +45,8 @@ void resetTest()
//=======MAIN=====
int main(void)
{
Unity.TestFile = "test/testdata/testsample.c";
UnityBegin();
Unity.TestFile = "test/testdata/testsample.c";
RUN_TEST(test_TheFirstThingToTest, 21, RUN_TEST_NO_ARGS);
RUN_TEST(test_TheSecondThingToTest, 43, RUN_TEST_NO_ARGS);

2
test/expectdata/testsample_run1.c
View File

@@ -54,8 +54,8 @@ void resetTest()
//=======MAIN=====
int main(void)
{
Unity.TestFile = "test/testdata/testsample.c";
UnityBegin();
Unity.TestFile = "test/testdata/testsample.c";
RUN_TEST(test_TheFirstThingToTest, 21);
RUN_TEST(test_TheSecondThingToTest, 43);

2
test/expectdata/testsample_run2.c
View File

@@ -57,8 +57,8 @@ void resetTest()
int main(void)
{
suite_setup();
Unity.TestFile = "test/testdata/testsample.c";
UnityBegin();
Unity.TestFile = "test/testdata/testsample.c";
RUN_TEST(test_TheFirstThingToTest, 21);
RUN_TEST(test_TheSecondThingToTest, 43);

2
test/expectdata/testsample_yaml.c
View File

@@ -58,8 +58,8 @@ void resetTest()
int main(void)
{
suite_setup();
Unity.TestFile = "test/testdata/testsample.c";
UnityBegin();
Unity.TestFile = "test/testdata/testsample.c";
RUN_TEST(test_TheFirstThingToTest, 21);
RUN_TEST(test_TheSecondThingToTest, 43);