Skip to content

T
Third Party Unity

OpenHarmony / Third Party Unity
1 年多 前同步成功

通知 36
Star 144
Fork 2
T
Third Party Unity
提交 eba387fa 编写于 作者: M Mark VanderVoord
浏览文件
操作

- Add tests which prove command line arguments now work with runner. Fixed a few bugs in this area.

上级 96f51e85
隐藏空白更改
内联 并排
Showing with 426 addition and 64 deletion
auto/generate_test_runner.rb
浏览文件 @ eba387fa
......@@ -327,8 +327,9 @@ class UnityTestRunnerGenerator
else
tests.each { |test| output.puts(" UnityPrint(\" #{test[:test]}\");\n UNITY_PRINT_EOL();")}
end
output.puts(" return 0;")
output.puts(" }")
output.puts(" return 0;")
output.puts(" return parse_status;")
output.puts(" }")
else
output.puts("int #{main_name}(void)")
......
src/unity.c
浏览文件 @ eba387fa
......@@ -1303,7 +1303,7 @@ int UnityEnd(void)
/*-----------------------------------------------
* Command Line Argument Support
*-----------------------------------------------*/
#ifdef UNITY_PARSE_COMMAND_LINE_ARGS
#ifdef UNITY_USE_COMMAND_LINE_ARGS
char* UnityOptionIncludeNamed = NULL;
char* UnityOptionExcludeNamed = NULL;
......@@ -1330,6 +1330,7 @@ int UnityParseOptions(int argc, char** argv)
{
UnityPrint("ERROR: No Test String to Include Matches For");
UNITY_PRINT_EOL();
return 1;
}
break;
case 'q': /* quiet */
......@@ -1346,11 +1347,12 @@ int UnityParseOptions(int argc, char** argv)
{
UnityPrint("ERROR: No Test String to Exclude Matches For");
UNITY_PRINT_EOL();
return 1;
}
break;
default:
UnityPrint("ERROR: Unknown Option ");
UNITY_PRINT_CHAR(argv[i][1]);
UNITY_OUTPUT_CHAR(argv[i][1]);
UNITY_PRINT_EOL();
return 1;
}
......@@ -1360,60 +1362,65 @@ int UnityParseOptions(int argc, char** argv)
return 0;
}
int UnityTestMatches(void)
int IsStringInBiggerString(const char* longstring, const char* shortstring)
{
/* Check if this test name matches the included test pattern */
if (UnityOptionsIncludedNamed)
retval = UnityStringArgumentMatches(UnityOptionIncludedNamed);
else
retval = 1;
char* lptr = (char*)longstring;
char* sptr = (char*)shortstring;
char* lnext = lptr;
while (*lptr)
{
lnext = lptr + 1;
/* Check if this test name matches the excluded test pattern */
if (UnityOptionsExcludedNamed)
if (UnityStringArgumentMatches(UnityOptionExcludedNamed))
retval = 0;
/* If they current bytes match, go on to the next bytes */
while (*lptr && *sptr && (*lptr == *sptr))
{
lptr++;
sptr++;
return retval;
/* We're done if we match the entire string or up to a wildcard */
if (*sptr == '*')
return 1;
if (*sptr == 0)
return 1;
}
/* Otherwise we start in the long pointer 1 character further and try again */
lptr = lnext;
sptr = (char*)shortstring;
}
return 0;
}
int UnityStringArgumentMatches(const char* str)
{
char* ptr = (char*)str;
while (*ptr)
{
char *begin = ptr;
char *pattern = (char *)Unity.CurrentTestName;
char *prefix = (char *)Unity.TestFile;
/* First, find out if this is the right test case */
while (*ptr && *prefix && (*prefix == *ptr || *prefix == '.'))
{
ptr++;
prefix++;
if (*ptr == '*')
return 1;
}
prefix++;
if (!*prefix)
{
while (*ptr && *pattern && *pattern == *ptr)
{
ptr++;
pattern++;
if (*ptr == '*')
return 1;
}
if (IsStringInBiggerString(Unity.TestFile, str))
return 1;
else if (IsStringInBiggerString(Unity.CurrentTestName, str))
return 1;
else
return 0;
}
/* If complete test name match, return true */
if (!*pattern)
return 1;
}
int UnityTestMatches(void)
{
/* Check if this test name matches the included test pattern */
int retval;
if (UnityOptionIncludeNamed)
{
retval = UnityStringArgumentMatches(UnityOptionIncludeNamed);
}
else
retval = 1;
ptr = begin + 1;
/* Check if this test name matches the excluded test pattern */
if (UnityOptionExcludeNamed)
{
if (UnityStringArgumentMatches(UnityOptionExcludeNamed))
retval = 0;
}
return retval;
}
#endif /* UNITY_PARSE_COMMAND_LINE_ARGS */
#endif /* UNITY_USE_COMMAND_LINE_ARGS */
/*-----------------------------------------------*/
src/unity_internals.h
浏览文件 @ eba387fa
......@@ -644,7 +644,7 @@ extern const char UnityStrErr64[];
* Command Line Argument Support
*-----------------------------------------------*/
#ifdef UNITY_PARSE_COMMAND_LINE_ARGS
#ifdef UNITY_USE_COMMAND_LINE_ARGS
int UnityParseOptions(int argc, char** argv);
int UnityTestMatches(void);
#endif
......
test/rakefile_helper.rb
浏览文件 @ eba387fa
......@@ -247,6 +247,7 @@ module RakefileHelpers
if output.match(/OK$/m).nil?
test_results += '.testfail'
else
report output if (!$verbose) #verbose already prints this line, as does a failure
test_results += '.testpass'
end
File.open(test_results, 'w') { |f| f.print output }
......
test/testdata/CException.h
浏览文件 @ eba387fa
......@@ -3,4 +3,9 @@
#define CEXCEPTION_BEING_USED 1
#define CEXCEPTION_NONE 0
#define CEXCEPTION_T int e = 1; (void)
#define Try if (e)
#define Catch(a) if (!a)
#endif //CEXCEPTION_H
test/tests/test_generate_test_runner.rb
浏览文件 @ eba387fa
......@@ -191,12 +191,12 @@ RUNNER_TESTS = [
}
},
{ :name => 'SupportCExceptionWhenRequested',
{ :name => 'CException',
:testfile => 'testdata/testRunnerGenerator.c',
:testdefines => ['TEST', 'USE_CEXCEPTION'],
:options => {
:test_prefix => "extest",
:cexception => 1,
:plugins => [ :cexception ],
},
:expected => {
:to_pass => [ 'extest_ShouldHandleCExceptionInTest' ],
......@@ -264,7 +264,7 @@ RUNNER_TESTS = [
}
},
{ :name => 'UseACustomMainFunction',
{ :name => 'CustomMain',
:testfile => 'testdata/testRunnerGenerator.c',
:testdefines => ['TEST', "USE_ANOTHER_MAIN"],
:options => {
......@@ -285,7 +285,7 @@ RUNNER_TESTS = [
}
},
{ :name => 'SupportCustomSuiteSetupAndTeardown',
{ :name => 'CustomSuiteSetupAndTeardown',
:testfile => 'testdata/testRunnerGenerator.c',
:testdefines => ['TEST'],
:includes => ['Defs.h'],
......@@ -306,7 +306,7 @@ RUNNER_TESTS = [
}
},
{ :name => 'SupportMainExternDeclaration',
{ :name => 'MainExternDeclaration',
:testfile => 'testdata/testRunnerGenerator.c',
:testdefines => ['TEST'],
:includes => ['Defs.h'],
......@@ -515,12 +515,12 @@ RUNNER_TESTS = [
}
},
{ :name => 'SupportCExceptionWhenRequested',
{ :name => 'CException',
:testfile => 'testdata/testRunnerGeneratorWithMocks.c',
:testdefines => ['TEST', 'USE_CEXCEPTION'],
:options => {
:test_prefix => "extest",
:cexception => 1,
:plugins => [ :cexception ],
},
:expected => {
:to_pass => [ 'extest_ShouldHandleCExceptionInTest' ],
......@@ -591,7 +591,7 @@ RUNNER_TESTS = [
}
},
{ :name => 'UseACustomMainFunction',
{ :name => 'CustomMain',
:testfile => 'testdata/testRunnerGeneratorWithMocks.c',
:testdefines => ['TEST', "USE_ANOTHER_MAIN"],
:options => {
......@@ -613,7 +613,7 @@ RUNNER_TESTS = [
}
},
{ :name => 'SupportCustomSuiteSetupAndTeardown',
{ :name => 'CustomSuiteSetupAndTeardown',
:testfile => 'testdata/testRunnerGeneratorWithMocks.c',
:testdefines => ['TEST'],
:includes => ['Defs.h'],
......@@ -635,7 +635,7 @@ RUNNER_TESTS = [
}
},
{ :name => 'SupportMainExternDeclaration',
{ :name => 'MainExternDeclaration',
:testfile => 'testdata/testRunnerGeneratorWithMocks.c',
:testdefines => ['TEST'],
:includes => ['Defs.h'],
......@@ -657,9 +657,323 @@ RUNNER_TESTS = [
:to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
}
},
#### WITH ARGS ##########################################
{ :name => 'ArgsThroughOptions',
:testfile => 'testdata/testRunnerGenerator.c',
:testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
:options => {
:cmdline_args => true,
},
:expected => {
:to_pass => [ 'test_ThisTestAlwaysPasses',
'spec_ThisTestPassesWhenNormalSetupRan',
'spec_ThisTestPassesWhenNormalTeardownRan',
'test_NotBeConfusedByLongComplicatedStrings',
'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
'test_StillNotBeConfusedByLongComplicatedStrings',
'should_RunTestsStartingWithShouldByDefault',
'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
],
:to_fail => [ 'test_ThisTestAlwaysFails' ],
:to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
}
},
{ :name => 'ArgsThroughCommandLine',
:testfile => 'testdata/testRunnerGenerator.c',
:testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
:cmdline => "--cmdline_args=1",
:expected => {
:to_pass => [ 'test_ThisTestAlwaysPasses',
'spec_ThisTestPassesWhenNormalSetupRan',
'spec_ThisTestPassesWhenNormalTeardownRan',
'test_NotBeConfusedByLongComplicatedStrings',
'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
'test_StillNotBeConfusedByLongComplicatedStrings',
'should_RunTestsStartingWithShouldByDefault',
'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
],
:to_fail => [ 'test_ThisTestAlwaysFails' ],
:to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
}
},
{ :name => 'ArgsThroughYAMLFile',
:testfile => 'testdata/testRunnerGenerator.c',
:testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
:cmdline => "",
:yaml => {
:cmdline_args => true,
},
:expected => {
:to_pass => [ 'test_ThisTestAlwaysPasses',
'spec_ThisTestPassesWhenNormalSetupRan',
'spec_ThisTestPassesWhenNormalTeardownRan',
'test_NotBeConfusedByLongComplicatedStrings',
'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
'test_StillNotBeConfusedByLongComplicatedStrings',
'should_RunTestsStartingWithShouldByDefault',
'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
],
:to_fail => [ 'test_ThisTestAlwaysFails' ],
:to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
}
},
{ :name => 'ArgsNameFilterJustTest',
:testfile => 'testdata/testRunnerGenerator.c',
:testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
:options => {
:cmdline_args => true,
},
:cmdline_args => "-n test_",
:expected => {
:to_pass => [ 'test_ThisTestAlwaysPasses',
'test_NotBeConfusedByLongComplicatedStrings',
'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
'test_StillNotBeConfusedByLongComplicatedStrings',
],
:to_fail => [ 'test_ThisTestAlwaysFails' ],
:to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
}
},
{ :name => 'ArgsNameFilterJustShould',
:testfile => 'testdata/testRunnerGenerator.c',
:testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
:options => {
:cmdline_args => true,
},
:cmdline_args => "-n should_",
:expected => {
:to_pass => [ 'should_RunTestsStartingWithShouldByDefault' ],
:to_fail => [ ],
:to_ignore => [ ],
}
},
{ :name => 'ArgsExcludeFilterJustTest',
:testfile => 'testdata/testRunnerGenerator.c',
:testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
:options => {
:cmdline_args => true,
},
:cmdline_args => "-x test_",
:expected => {
:to_pass => [ 'spec_ThisTestPassesWhenNormalSetupRan',
'spec_ThisTestPassesWhenNormalTeardownRan',
'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
'should_RunTestsStartingWithShouldByDefault',
],
:to_fail => [ ],
:to_ignore => [ ],
}
},
{ :name => 'ArgsIncludeAndExcludeFilter',
:testfile => 'testdata/testRunnerGenerator.c',
:testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
:options => {
:cmdline_args => true,
:includes => ['Defs.h'],
},
:cmdline_args => "-n test_ -x Ignored",
:expected => {
:to_pass => [ 'test_ThisTestAlwaysPasses',
'test_NotBeConfusedByLongComplicatedStrings',
'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
'test_StillNotBeConfusedByLongComplicatedStrings',
],
:to_fail => [ 'test_ThisTestAlwaysFails' ],
:to_ignore => [ ],
}
},
{ :name => 'ArgsIncludeSingleTest',
:testfile => 'testdata/testRunnerGenerator.c',
:testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
:options => {
:cmdline_args => true,
},
:cmdline_args => "-n ThisTestAlwaysPasses",
:expected => {
:to_pass => [ 'test_ThisTestAlwaysPasses' ],
:to_fail => [ ],
:to_ignore => [ ],
}
},
{ :name => 'ArgsIncludeNoTests',
:testfile => 'testdata/testRunnerGenerator.c',
:testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
:options => {
:cmdline_args => true,
},
:cmdline_args => "-n ThisTestDoesNotExist",
:expected => {
:to_pass => [ ],
:to_fail => [ ],
:to_ignore => [ ],
}
},
{ :name => 'ArgsExcludeAllTests',
:testfile => 'testdata/testRunnerGenerator.c',
:testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
:options => {
:cmdline_args => true,
},
:cmdline_args => "-x _",
:expected => {
:to_pass => [ ],
:to_fail => [ ],
:to_ignore => [ ],
}
},
{ :name => 'ArgsIncludeFullFile',
:testfile => 'testdata/testRunnerGenerator.c',
:testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
:options => {
:cmdline_args => true,
},
:cmdline_args => "-n testRunnerGenerator",
:expected => {
:to_pass => [ 'test_ThisTestAlwaysPasses',
'spec_ThisTestPassesWhenNormalSetupRan',
'spec_ThisTestPassesWhenNormalTeardownRan',
'test_NotBeConfusedByLongComplicatedStrings',
'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
'test_StillNotBeConfusedByLongComplicatedStrings',
'should_RunTestsStartingWithShouldByDefault',
'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
],
:to_fail => [ 'test_ThisTestAlwaysFails' ],
:to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
}
},
{ :name => 'ArgsIncludeWithParameterized',
:testfile => 'testdata/testRunnerGenerator.c',
:testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
:cmdline => "--use_param_tests=1",
:yaml => {
:cmdline_args => true,
:test_prefix => "paratest"
},
:cmdline_args => "-n ShouldHandleParameterizedTests",
:expected => {
:to_pass => [ 'paratest_ShouldHandleParameterizedTests\(25\)',
'paratest_ShouldHandleParameterizedTests\(125\)',
'paratest_ShouldHandleParameterizedTests\(5\)',
'paratest_ShouldHandleParameterizedTests2\(7\)',
],
:to_fail => [ 'paratest_ShouldHandleParameterizedTestsThatFail\(17\)' ],
:to_ignore => [ ],
}
},
{ :name => 'ArgsList',
:testfile => 'testdata/testRunnerGenerator.c',
:testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
:options => {
:cmdline_args => true,
},
:cmdline_args => "-l",
:expected => {
:to_pass => [ ],
:to_fail => [ ],
:to_ignore => [ ],
:text => [ "testRunnerGenerator",
"test_ThisTestAlwaysPasses",
"test_ThisTestAlwaysFails",
"test_ThisTestAlwaysIgnored",
"spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan",
"spec_ThisTestPassesWhenNormalSetupRan",
"spec_ThisTestPassesWhenNormalTeardownRan",
"test_NotBeConfusedByLongComplicatedStrings",
"test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings",
"test_StillNotBeConfusedByLongComplicatedStrings",
"should_RunTestsStartingWithShouldByDefault"
]
}
},
{ :name => 'ArgsListParameterized',
:testfile => 'testdata/testRunnerGenerator.c',
:testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
:options => {
:test_prefix => "paratest",
:use_param_tests => true,
:cmdline_args => true,
},
:cmdline_args => "-l",
:expected => {
:to_pass => [ ],
:to_fail => [ ],
:to_ignore => [ ],
:text => [ "testRunnerGenerator",
'paratest_ShouldHandleParameterizedTests\(25\)',
'paratest_ShouldHandleParameterizedTests\(125\)',
'paratest_ShouldHandleParameterizedTests\(5\)',
'paratest_ShouldHandleParameterizedTests2\(7\)',
'paratest_ShouldHandleNonParameterizedTestsWhenParameterizationValid\(RUN_TEST_NO_ARGS\)',
'paratest_ShouldHandleParameterizedTestsThatFail\(17\)'
],
}
},
{ :name => 'ArgsIncompleteIncludeFlags',
:testfile => 'testdata/testRunnerGenerator.c',
:testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
:options => {
:cmdline_args => true,
},
:cmdline_args => "-n",
:expected => {
:to_pass => [ ],
:to_fail => [ ],
:to_ignore => [ ],
:text => [ "ERROR: No Test String to Include Matches For" ],
}
},
{ :name => 'ArgsIncompleteExcludeFlags',
:testfile => 'testdata/testRunnerGenerator.c',
:testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
:options => {
:cmdline_args => true,
},
:cmdline_args => "-x",
:expected => {
:to_pass => [ ],
:to_fail => [ ],
:to_ignore => [ ],
:text => [ "ERROR: No Test String to Exclude Matches For" ],
}
},
{ :name => 'ArgsIllegalFlags',
:testfile => 'testdata/testRunnerGenerator.c',
:testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
:options => {
:cmdline_args => true,
},
:cmdline_args => "-z",
:expected => {
:to_pass => [ ],
:to_fail => [ ],
:to_ignore => [ ],
:text => [ "ERROR: Unknown Option z" ],
}
},
]
def runner_test(test, runner, expected, test_defines)
def runner_test(test, runner, expected, test_defines, cmdline_args)
# Tack on TEST define for compiling unit tests
load_configuration($cfg_file)
......@@ -676,7 +990,8 @@ def runner_test(test, runner, expected, test_defines)
# Execute unit test and generate results file
simulator = build_simulator_fields
executable = $cfg['linker']['bin_files']['destination'] + test_base + $cfg['linker']['bin_files']['extension']
cmdline_args ||= ""
executable = $cfg['linker']['bin_files']['destination'] + test_base + $cfg['linker']['bin_files']['extension'] + " #{cmdline_args}"
if simulator.nil?
cmd_str = executable
else
......@@ -685,15 +1000,48 @@ def runner_test(test, runner, expected, test_defines)
output = execute(cmd_str, true)
#compare to the expected pass/fail
allgood = expected[:to_pass].inject(true) {|s,v| s && (/#{v}:PASS/ =~ output) }
allgood = expected[:to_fail].inject(allgood) {|s,v| s && (/#{v}:FAIL/ =~ output) }
allgood = expected[:to_ignore].inject(allgood) {|s,v| s && (/#{v}:IGNORE/ =~ output) }
allgood = expected[:to_pass].inject(true) {|s,v| s && verify_match(/#{v}:PASS/, output) }
allgood = expected[:to_fail].inject(allgood) {|s,v| s && verify_match(/#{v}:FAIL/, output) }
allgood = expected[:to_ignore].inject(allgood) {|s,v| s && verify_match(/#{v}:IGNORE/, output) }
#verify there weren't more pass/fail/etc than expected
allgood &&= verify_number( expected[:to_pass], /(:PASS)/, output)
allgood &&= verify_number( expected[:to_fail], /(:FAIL)/, output)
allgood &&= verify_number( expected[:to_ignore], /(:IGNORE)/, output)
#if we care about any other text, check that too
if (expected[:text])
allgood = expected[:text].inject(allgood) {|s,v| s && verify_match(/#{v}/, output) }
allgood &&= verify_number( expected[:text], /.+/, output )
end
report output if (!allgood && !$verbose) #report failures if not already reporting everything
return allgood
end
def verify_match(expression, output)
if (expression =~ output)
return true
else
report " FAIL: No Match For /#{expression.to_s}/"
return false
end
end
def verify_number(expected, expression, output)
exp = expected.length
act = output.scan(expression).length
if (exp == act)
return true
else
report " FAIL: Expected #{exp} Matches For /#{expression.to_s}/. Was #{act}"
return false
end
end
RUNNER_TESTS.each do |testset|
testset_name = "Runner_#{testset[:testfile]}_#{testset[:name]}"
basename = File.basename(testset[:testfile], C_EXTENSION)
testset_name = "Runner_#{basename}_#{testset[:name]}"
should testset_name do
runner_name = OUT_FILE + testset[:name] + '_runner.c'
......@@ -713,7 +1061,7 @@ RUNNER_TESTS.each do |testset|
end
#test the script against the specified test file and check results
if (runner_test(testset[:testfile], runner_name, testset[:expected], testset[:testdefines]))
if (runner_test(testset[:testfile], runner_name, testset[:expected], testset[:testdefines], testset[:cmdline_args]))
report "#{testset_name}:PASS"
else
report "#{testset_name}:FAIL"
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或