mirror of
https://github.com/ThrowTheSwitch/Unity.git
synced 2025-06-20 22:13:29 +08:00
Merge pull request #65 from ThrowTheSwitch/bug/init
Fixed initialization of data structure
This commit is contained in:
@ -266,8 +266,8 @@ class UnityTestRunnerGenerator
|
|||||||
output.puts("int main(void)")
|
output.puts("int main(void)")
|
||||||
output.puts("{")
|
output.puts("{")
|
||||||
output.puts(" suite_setup();") unless @options[:suite_setup].nil?
|
output.puts(" suite_setup();") unless @options[:suite_setup].nil?
|
||||||
output.puts(" Unity.TestFile = \"#{filename}\";")
|
|
||||||
output.puts(" UnityBegin();")
|
output.puts(" UnityBegin();")
|
||||||
|
output.puts(" Unity.TestFile = \"#{filename}\";")
|
||||||
if (@options[:use_param_tests])
|
if (@options[:use_param_tests])
|
||||||
tests.each do |test|
|
tests.each do |test|
|
||||||
if ((test[:args].nil?) or (test[:args].empty?))
|
if ((test[:args].nil?) or (test[:args].empty?))
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
#define UNITY_SKIP_EXECUTION { if ((Unity.CurrentTestFailed != 0) || (Unity.CurrentTestIgnored != 0)) {return;} }
|
#define UNITY_SKIP_EXECUTION { if ((Unity.CurrentTestFailed != 0) || (Unity.CurrentTestIgnored != 0)) {return;} }
|
||||||
#define UNITY_PRINT_EOL { UNITY_OUTPUT_CHAR('\n'); }
|
#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* UnityStrNull = "NULL";
|
||||||
const char* UnityStrSpacer = ". ";
|
const char* UnityStrSpacer = ". ";
|
||||||
@ -1115,6 +1115,9 @@ void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int
|
|||||||
//-----------------------------------------------
|
//-----------------------------------------------
|
||||||
void UnityBegin(void)
|
void UnityBegin(void)
|
||||||
{
|
{
|
||||||
|
Unity.TestFile = NULL;
|
||||||
|
Unity.CurrentTestName = NULL;
|
||||||
|
Unity.CurrentTestLineNumber = 0;
|
||||||
Unity.NumberOfTests = 0;
|
Unity.NumberOfTests = 0;
|
||||||
Unity.TestFailures = 0;
|
Unity.TestFailures = 0;
|
||||||
Unity.TestIgnores = 0;
|
Unity.TestIgnores = 0;
|
||||||
|
@ -48,8 +48,8 @@ void resetTest()
|
|||||||
//=======MAIN=====
|
//=======MAIN=====
|
||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
Unity.TestFile = "test/testdata/testsample.c";
|
|
||||||
UnityBegin();
|
UnityBegin();
|
||||||
|
Unity.TestFile = "test/testdata/testsample.c";
|
||||||
RUN_TEST(test_TheFirstThingToTest, 21);
|
RUN_TEST(test_TheFirstThingToTest, 21);
|
||||||
RUN_TEST(test_TheSecondThingToTest, 43);
|
RUN_TEST(test_TheSecondThingToTest, 43);
|
||||||
|
|
||||||
|
@ -44,8 +44,8 @@ void resetTest()
|
|||||||
//=======MAIN=====
|
//=======MAIN=====
|
||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
Unity.TestFile = "test/testdata/testsample.c";
|
|
||||||
UnityBegin();
|
UnityBegin();
|
||||||
|
Unity.TestFile = "test/testdata/testsample.c";
|
||||||
RUN_TEST(test_TheFirstThingToTest, 21);
|
RUN_TEST(test_TheFirstThingToTest, 21);
|
||||||
RUN_TEST(test_TheSecondThingToTest, 43);
|
RUN_TEST(test_TheSecondThingToTest, 43);
|
||||||
|
|
||||||
|
@ -69,8 +69,8 @@ void resetTest()
|
|||||||
//=======MAIN=====
|
//=======MAIN=====
|
||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
Unity.TestFile = "test/testdata/mocksample.c";
|
|
||||||
UnityBegin();
|
UnityBegin();
|
||||||
|
Unity.TestFile = "test/testdata/mocksample.c";
|
||||||
RUN_TEST(test_TheFirstThingToTest, 21);
|
RUN_TEST(test_TheFirstThingToTest, 21);
|
||||||
RUN_TEST(test_TheSecondThingToTest, 43);
|
RUN_TEST(test_TheSecondThingToTest, 43);
|
||||||
|
|
||||||
|
@ -65,8 +65,8 @@ void resetTest()
|
|||||||
//=======MAIN=====
|
//=======MAIN=====
|
||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
Unity.TestFile = "test/testdata/mocksample.c";
|
|
||||||
UnityBegin();
|
UnityBegin();
|
||||||
|
Unity.TestFile = "test/testdata/mocksample.c";
|
||||||
RUN_TEST(test_TheFirstThingToTest, 21);
|
RUN_TEST(test_TheFirstThingToTest, 21);
|
||||||
RUN_TEST(test_TheSecondThingToTest, 43);
|
RUN_TEST(test_TheSecondThingToTest, 43);
|
||||||
|
|
||||||
|
@ -78,8 +78,8 @@ void resetTest()
|
|||||||
//=======MAIN=====
|
//=======MAIN=====
|
||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
Unity.TestFile = "test/testdata/mocksample.c";
|
|
||||||
UnityBegin();
|
UnityBegin();
|
||||||
|
Unity.TestFile = "test/testdata/mocksample.c";
|
||||||
RUN_TEST(test_TheFirstThingToTest, 21);
|
RUN_TEST(test_TheFirstThingToTest, 21);
|
||||||
RUN_TEST(test_TheSecondThingToTest, 43);
|
RUN_TEST(test_TheSecondThingToTest, 43);
|
||||||
|
|
||||||
|
@ -78,8 +78,8 @@ void resetTest()
|
|||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
suite_setup();
|
suite_setup();
|
||||||
Unity.TestFile = "test/testdata/mocksample.c";
|
|
||||||
UnityBegin();
|
UnityBegin();
|
||||||
|
Unity.TestFile = "test/testdata/mocksample.c";
|
||||||
RUN_TEST(test_TheFirstThingToTest, 21);
|
RUN_TEST(test_TheFirstThingToTest, 21);
|
||||||
RUN_TEST(test_TheSecondThingToTest, 43);
|
RUN_TEST(test_TheSecondThingToTest, 43);
|
||||||
|
|
||||||
|
@ -66,8 +66,8 @@ void resetTest()
|
|||||||
//=======MAIN=====
|
//=======MAIN=====
|
||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
Unity.TestFile = "test/testdata/mocksample.c";
|
|
||||||
UnityBegin();
|
UnityBegin();
|
||||||
|
Unity.TestFile = "test/testdata/mocksample.c";
|
||||||
RUN_TEST(test_TheFirstThingToTest, 21, RUN_TEST_NO_ARGS);
|
RUN_TEST(test_TheFirstThingToTest, 21, RUN_TEST_NO_ARGS);
|
||||||
RUN_TEST(test_TheSecondThingToTest, 43, RUN_TEST_NO_ARGS);
|
RUN_TEST(test_TheSecondThingToTest, 43, RUN_TEST_NO_ARGS);
|
||||||
|
|
||||||
|
@ -78,8 +78,8 @@ void resetTest()
|
|||||||
//=======MAIN=====
|
//=======MAIN=====
|
||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
Unity.TestFile = "test/testdata/mocksample.c";
|
|
||||||
UnityBegin();
|
UnityBegin();
|
||||||
|
Unity.TestFile = "test/testdata/mocksample.c";
|
||||||
RUN_TEST(test_TheFirstThingToTest, 21);
|
RUN_TEST(test_TheFirstThingToTest, 21);
|
||||||
RUN_TEST(test_TheSecondThingToTest, 43);
|
RUN_TEST(test_TheSecondThingToTest, 43);
|
||||||
|
|
||||||
|
@ -78,8 +78,8 @@ void resetTest()
|
|||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
suite_setup();
|
suite_setup();
|
||||||
Unity.TestFile = "test/testdata/mocksample.c";
|
|
||||||
UnityBegin();
|
UnityBegin();
|
||||||
|
Unity.TestFile = "test/testdata/mocksample.c";
|
||||||
RUN_TEST(test_TheFirstThingToTest, 21);
|
RUN_TEST(test_TheFirstThingToTest, 21);
|
||||||
RUN_TEST(test_TheSecondThingToTest, 43);
|
RUN_TEST(test_TheSecondThingToTest, 43);
|
||||||
|
|
||||||
|
@ -79,8 +79,8 @@ void resetTest()
|
|||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
suite_setup();
|
suite_setup();
|
||||||
Unity.TestFile = "test/testdata/mocksample.c";
|
|
||||||
UnityBegin();
|
UnityBegin();
|
||||||
|
Unity.TestFile = "test/testdata/mocksample.c";
|
||||||
RUN_TEST(test_TheFirstThingToTest, 21);
|
RUN_TEST(test_TheFirstThingToTest, 21);
|
||||||
RUN_TEST(test_TheSecondThingToTest, 43);
|
RUN_TEST(test_TheSecondThingToTest, 43);
|
||||||
|
|
||||||
|
@ -54,8 +54,8 @@ void resetTest()
|
|||||||
//=======MAIN=====
|
//=======MAIN=====
|
||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
Unity.TestFile = "test/testdata/testsample.c";
|
|
||||||
UnityBegin();
|
UnityBegin();
|
||||||
|
Unity.TestFile = "test/testdata/testsample.c";
|
||||||
RUN_TEST(test_TheFirstThingToTest, 21);
|
RUN_TEST(test_TheFirstThingToTest, 21);
|
||||||
RUN_TEST(test_TheSecondThingToTest, 43);
|
RUN_TEST(test_TheSecondThingToTest, 43);
|
||||||
|
|
||||||
|
@ -57,8 +57,8 @@ void resetTest()
|
|||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
suite_setup();
|
suite_setup();
|
||||||
Unity.TestFile = "test/testdata/testsample.c";
|
|
||||||
UnityBegin();
|
UnityBegin();
|
||||||
|
Unity.TestFile = "test/testdata/testsample.c";
|
||||||
RUN_TEST(test_TheFirstThingToTest, 21);
|
RUN_TEST(test_TheFirstThingToTest, 21);
|
||||||
RUN_TEST(test_TheSecondThingToTest, 43);
|
RUN_TEST(test_TheSecondThingToTest, 43);
|
||||||
|
|
||||||
|
@ -45,8 +45,8 @@ void resetTest()
|
|||||||
//=======MAIN=====
|
//=======MAIN=====
|
||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
Unity.TestFile = "test/testdata/testsample.c";
|
|
||||||
UnityBegin();
|
UnityBegin();
|
||||||
|
Unity.TestFile = "test/testdata/testsample.c";
|
||||||
RUN_TEST(test_TheFirstThingToTest, 21, RUN_TEST_NO_ARGS);
|
RUN_TEST(test_TheFirstThingToTest, 21, RUN_TEST_NO_ARGS);
|
||||||
RUN_TEST(test_TheSecondThingToTest, 43, RUN_TEST_NO_ARGS);
|
RUN_TEST(test_TheSecondThingToTest, 43, RUN_TEST_NO_ARGS);
|
||||||
|
|
||||||
|
@ -54,8 +54,8 @@ void resetTest()
|
|||||||
//=======MAIN=====
|
//=======MAIN=====
|
||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
Unity.TestFile = "test/testdata/testsample.c";
|
|
||||||
UnityBegin();
|
UnityBegin();
|
||||||
|
Unity.TestFile = "test/testdata/testsample.c";
|
||||||
RUN_TEST(test_TheFirstThingToTest, 21);
|
RUN_TEST(test_TheFirstThingToTest, 21);
|
||||||
RUN_TEST(test_TheSecondThingToTest, 43);
|
RUN_TEST(test_TheSecondThingToTest, 43);
|
||||||
|
|
||||||
|
@ -57,8 +57,8 @@ void resetTest()
|
|||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
suite_setup();
|
suite_setup();
|
||||||
Unity.TestFile = "test/testdata/testsample.c";
|
|
||||||
UnityBegin();
|
UnityBegin();
|
||||||
|
Unity.TestFile = "test/testdata/testsample.c";
|
||||||
RUN_TEST(test_TheFirstThingToTest, 21);
|
RUN_TEST(test_TheFirstThingToTest, 21);
|
||||||
RUN_TEST(test_TheSecondThingToTest, 43);
|
RUN_TEST(test_TheSecondThingToTest, 43);
|
||||||
|
|
||||||
|
@ -58,8 +58,8 @@ void resetTest()
|
|||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
suite_setup();
|
suite_setup();
|
||||||
Unity.TestFile = "test/testdata/testsample.c";
|
|
||||||
UnityBegin();
|
UnityBegin();
|
||||||
|
Unity.TestFile = "test/testdata/testsample.c";
|
||||||
RUN_TEST(test_TheFirstThingToTest, 21);
|
RUN_TEST(test_TheFirstThingToTest, 21);
|
||||||
RUN_TEST(test_TheSecondThingToTest, 43);
|
RUN_TEST(test_TheSecondThingToTest, 43);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user