espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-12-10 00:26:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

make fixtures and examples compatible with new UnityBegin method.

Browse Source
This commit is contained in:
Mark VanderVoord
2014-08-16 10:51:25 -04:00
parent 14b074336b
commit 376480a4d9
6 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/example_1/test/test_runners/TestProductionCode2_Runner.c
View File

@@ -33,8 +33,7 @@ void resetTest()
int main(void) int main(void)
{ {
Unity.TestFile = "test/TestProductionCode2.c"; UnityBegin("test/TestProductionCode2.c");
UnityBegin();
// RUN_TEST calls runTest // RUN_TEST calls runTest
RUN_TEST(test_IgnoredTest, 13); RUN_TEST(test_IgnoredTest, 13);

3
examples/example_1/test/test_runners/TestProductionCode_Runner.c
View File

@@ -35,8 +35,7 @@ void resetTest()
int main(void) int main(void)
{ {
Unity.TestFile = "test/TestProductionCode.c"; UnityBegin("test/TestProductionCode.c");
UnityBegin();
// RUN_TEST calls runTest // RUN_TEST calls runTest
RUN_TEST(test_FindFunction_WhichIsBroken_ShouldReturnZeroIfItemIsNotInList_WhichWorksEvenInOurBrokenCode, 20); RUN_TEST(test_FindFunction_WhichIsBroken_ShouldReturnZeroIfItemIsNotInList_WhichWorksEvenInOurBrokenCode, 20);

3
examples/example_3/test/no_ruby/TestProductionCode2_Runner.c
View File

@@ -33,8 +33,7 @@ void resetTest()
int main(void) int main(void)
{ {
Unity.TestFile = "test/TestProductionCode2.c"; UnityBegin("test/TestProductionCode2.c");
UnityBegin();
// RUN_TEST calls runTest // RUN_TEST calls runTest
RUN_TEST(test_IgnoredTest, 13); RUN_TEST(test_IgnoredTest, 13);

3
examples/example_3/test/no_ruby/TestProductionCode_Runner.c
View File

@@ -35,8 +35,7 @@ void resetTest()
int main(void) int main(void)
{ {
Unity.TestFile = "test/TestProductionCode.c"; UnityBegin("test/TestProductionCode.c");
UnityBegin();
// RUN_TEST calls runTest // RUN_TEST calls runTest
RUN_TEST(test_FindFunction_WhichIsBroken_ShouldReturnZeroIfItemIsNotInList_WhichWorksEvenInOurBrokenCode, 20); RUN_TEST(test_FindFunction_WhichIsBroken_ShouldReturnZeroIfItemIsNotInList_WhichWorksEvenInOurBrokenCode, 20);

2
extras/fixture/rakefile_helper.rb
View File

@@ -16,7 +16,7 @@ module RakefileHelpers
def load_configuration(config_file) def load_configuration(config_file)
unless ($configured) unless ($configured)
$cfg_file = HERE+"../../targets/#{config_file}" unless (config_file =~ /[\\|\/]/) $cfg_file = HERE+"../../test/targets/#{config_file}" unless (config_file =~ /[\\|\/]/)
$cfg = YAML.load(File.read($cfg_file)) $cfg = YAML.load(File.read($cfg_file))
$colour_output = false unless $cfg['colour'] $colour_output = false unless $cfg['colour']
$configured = true if (config_file != DEFAULT_CONFIG_FILE) $configured = true if (config_file != DEFAULT_CONFIG_FILE)

2
extras/fixture/src/unity_fixture.c
View File

@@ -38,7 +38,7 @@ int UnityMain(int argc, char* argv[], void (*runAllTests)(void))
for (r = 0; r < UnityFixture.RepeatCount; r++) for (r = 0; r < UnityFixture.RepeatCount; r++)
{ {
announceTestRun(r); announceTestRun(r);
UnityBegin(); UnityBegin(argv[0]);
runAllTests(); runAllTests();
UNITY_OUTPUT_CHAR('\n'); UNITY_OUTPUT_CHAR('\n');
UnityEnd(); UnityEnd();