提交 94fc6894 编写于 作者: J jsalling

100% code coverage for Unity Fixture

 Add tests for uncovered lines
上级 cc0f58cf
...@@ -75,5 +75,6 @@ CFLAGS += -Wstrict-prototypes ...@@ -75,5 +75,6 @@ CFLAGS += -Wstrict-prototypes
CFLAGS += -Wswitch-default CFLAGS += -Wswitch-default
CFLAGS += -Wundef CFLAGS += -Wundef
CFLAGS += -Wno-error=undef # Warning only, this should not stop the build CFLAGS += -Wno-error=undef # Warning only, this should not stop the build
CFLAGS += -Wunreachable-code
CFLAGS += -Wunused CFLAGS += -Wunused
CFLAGS += -fstrict-aliasing CFLAGS += -fstrict-aliasing
...@@ -136,6 +136,22 @@ TEST(UnityFixture, FreeNULLSafety) ...@@ -136,6 +136,22 @@ TEST(UnityFixture, FreeNULLSafety)
free(NULL); free(NULL);
} }
TEST(UnityFixture, ConcludeTestIncrementsFailCount)
{
_U_UINT savedFails = Unity.TestFailures;
_U_UINT savedIgnores = Unity.TestIgnores;
UnityOutputCharSpy_Enable(1);
Unity.CurrentTestFailed = 1;
UnityConcludeFixtureTest(); // Resets TestFailed for this test to pass
Unity.CurrentTestIgnored = 1;
UnityConcludeFixtureTest(); // Resets TestIgnored
UnityOutputCharSpy_Enable(0);
TEST_ASSERT_EQUAL(savedFails + 1, Unity.TestFailures);
TEST_ASSERT_EQUAL(savedIgnores + 1, Unity.TestIgnores);
Unity.TestFailures = savedFails;
Unity.TestIgnores = savedIgnores;
}
//------------------------------------------------------------ //------------------------------------------------------------
TEST_GROUP(UnityCommandOptions); TEST_GROUP(UnityCommandOptions);
...@@ -276,6 +292,21 @@ TEST(UnityCommandOptions, UnknownCommandIsIgnored) ...@@ -276,6 +292,21 @@ TEST(UnityCommandOptions, UnknownCommandIsIgnored)
TEST_ASSERT_EQUAL(98, UnityFixture.RepeatCount); TEST_ASSERT_EQUAL(98, UnityFixture.RepeatCount);
} }
TEST(UnityCommandOptions, GroupOrNameFilterWithoutStringFails)
{
TEST_ASSERT_EQUAL(1, UnityGetCommandLineOptions(3, unknownCommand));
TEST_ASSERT_EQUAL(1, UnityGetCommandLineOptions(5, unknownCommand));
TEST_ASSERT_EQUAL(1, UnityMain(3, unknownCommand, NULL));
}
TEST(UnityCommandOptions, GroupFilterReallyFilters)
{
_U_UINT saved = Unity.NumberOfTests;
TEST_ASSERT_EQUAL(0, UnityGetCommandLineOptions(4, unknownCommand));
UnityIgnoreTest(NULL, "non-matching", NULL);
TEST_ASSERT_EQUAL(saved, Unity.NumberOfTests);
}
IGNORE_TEST(UnityCommandOptions, TestShouldBeIgnored) IGNORE_TEST(UnityCommandOptions, TestShouldBeIgnored)
{ {
TEST_FAIL_MESSAGE("This test should not run!"); TEST_FAIL_MESSAGE("This test should not run!");
......
...@@ -19,6 +19,7 @@ TEST_GROUP_RUNNER(UnityFixture) ...@@ -19,6 +19,7 @@ TEST_GROUP_RUNNER(UnityFixture)
RUN_TEST_CASE(UnityFixture, CallocFillsWithZero); RUN_TEST_CASE(UnityFixture, CallocFillsWithZero);
RUN_TEST_CASE(UnityFixture, PointerSet); RUN_TEST_CASE(UnityFixture, PointerSet);
RUN_TEST_CASE(UnityFixture, FreeNULLSafety); RUN_TEST_CASE(UnityFixture, FreeNULLSafety);
RUN_TEST_CASE(UnityFixture, ConcludeTestIncrementsFailCount);
} }
TEST_GROUP_RUNNER(UnityCommandOptions) TEST_GROUP_RUNNER(UnityCommandOptions)
...@@ -32,6 +33,8 @@ TEST_GROUP_RUNNER(UnityCommandOptions) ...@@ -32,6 +33,8 @@ TEST_GROUP_RUNNER(UnityCommandOptions)
RUN_TEST_CASE(UnityCommandOptions, MultipleOptions); RUN_TEST_CASE(UnityCommandOptions, MultipleOptions);
RUN_TEST_CASE(UnityCommandOptions, MultipleOptionsDashRNotLastAndNoValueSpecified); RUN_TEST_CASE(UnityCommandOptions, MultipleOptionsDashRNotLastAndNoValueSpecified);
RUN_TEST_CASE(UnityCommandOptions, UnknownCommandIsIgnored); RUN_TEST_CASE(UnityCommandOptions, UnknownCommandIsIgnored);
RUN_TEST_CASE(UnityCommandOptions, GroupOrNameFilterWithoutStringFails);
RUN_TEST_CASE(UnityCommandOptions, GroupFilterReallyFilters);
RUN_TEST_CASE(UnityCommandOptions, TestShouldBeIgnored); RUN_TEST_CASE(UnityCommandOptions, TestShouldBeIgnored);
} }
......
...@@ -19,7 +19,7 @@ static int spy_enable; ...@@ -19,7 +19,7 @@ static int spy_enable;
void UnityOutputCharSpy_Create(int s) void UnityOutputCharSpy_Create(int s)
{ {
size = s; size = (s > 0) ? s : 0;
count = 0; count = 0;
spy_enable = 0; spy_enable = 0;
buffer = malloc((size_t)size); buffer = malloc((size_t)size);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册