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

reenable results summary.

Browse Source 
support tests named spec as well.
clean up UnityBegin to make us not have to dig inside it to inject the filename.
Add UNITY_OUTPUT_START() and UNITY_OUTPUT_COMPLETE() for future use.
This commit is contained in:
Mark VanderVoord
2014-07-30 22:12:49 -04:00
parent a4a2eb787d
commit 14b074336b
5 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
auto/generate_test_runner.rb
View File

@ -78,7 +78,7 @@ class UnityTestRunnerGenerator
lines.each_with_index do |line, index| lines.each_with_index do |line, index|
#find tests #find tests
if line =~ /^((?:\s*TEST_CASE\s*\(.*?\)\s*)*)\s*void\s+(test.*?)\s*\(\s*(.*)\s*\)/ if line =~ /^((?:\s*TEST_CASE\s*\(.*?\)\s*)*)\s*void\s+((?:test.*)|(?:spec.*))\s*\(\s*(.*)\s*\)/
arguments = $1 arguments = $1
name = $2 name = $2
call = $3 call = $3
@ -266,8 +266,7 @@ 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(" UnityBegin();") output.puts(" UnityBegin(\"#{filename}\");")
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?))

7
src/unity.c
View File

@ -1102,9 +1102,9 @@ void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int
} }
//----------------------------------------------- //-----------------------------------------------
void UnityBegin(void) void UnityBegin(const char* filename)
{ {
Unity.TestFile = NULL; Unity.TestFile = filename;
Unity.CurrentTestName = NULL; Unity.CurrentTestName = NULL;
Unity.CurrentTestLineNumber = 0; Unity.CurrentTestLineNumber = 0;
Unity.NumberOfTests = 0; Unity.NumberOfTests = 0;
@ -1112,6 +1112,8 @@ void UnityBegin(void)
Unity.TestIgnores = 0; Unity.TestIgnores = 0;
Unity.CurrentTestFailed = 0; Unity.CurrentTestFailed = 0;
Unity.CurrentTestIgnored = 0; Unity.CurrentTestIgnored = 0;
UNITY_OUTPUT_START();
} }
//----------------------------------------------- //-----------------------------------------------
@ -1136,6 +1138,7 @@ int UnityEnd(void)
UnityPrintFail(); UnityPrintFail();
} }
UNITY_PRINT_EOL; UNITY_PRINT_EOL;
UNITY_OUTPUT_COMPLETE();
return (int)(Unity.TestFailures); return (int)(Unity.TestFailures);
} }

17
src/unity_internals.h
View File

@ -258,20 +258,23 @@ typedef UNITY_DOUBLE_TYPE _UD;
#endif #endif
//------------------------------------------------------- //-------------------------------------------------------
// Output Method // Output Method: stdout (DEFAULT)
//------------------------------------------------------- //-------------------------------------------------------
#ifndef UNITY_OUTPUT_CHAR #ifndef UNITY_OUTPUT_CHAR
//Default to using putchar, which is defined in stdio.h //Default to using putchar, which is defined in stdio.h
#include <stdio.h> #include <stdio.h>
#define UNITY_OUTPUT_CHAR(a) putchar(a) #define UNITY_OUTPUT_CHAR(a) putchar(a)
#else #else
//If defined as something else, make sure we declare it here so it's ready for use //If defined as something else, make sure we declare it here so it's ready for use
extern int UNITY_OUTPUT_CHAR(int); extern int UNITY_OUTPUT_CHAR(int);
#endif
#ifndef UNITY_OUTPUT_START
#define UNITY_OUTPUT_START()
#endif
#ifndef UNITY_OUTPUT_COMPLETE
#define UNITY_OUTPUT_COMPLETE()
#endif #endif
//------------------------------------------------------- //-------------------------------------------------------
@ -388,7 +391,7 @@ extern struct _Unity Unity;
// Test Suite Management // Test Suite Management
//------------------------------------------------------- //-------------------------------------------------------
void UnityBegin(void); void UnityBegin(const char* filename);
int UnityEnd(void); int UnityEnd(void);
void UnityConcludeTest(void); void UnityConcludeTest(void);
void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum); void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum);
@ -544,7 +547,7 @@ extern const char* UnityStrErr64;
#define TEST_IS_IGNORED (Unity.CurrentTestIgnored) #define TEST_IS_IGNORED (Unity.CurrentTestIgnored)
#ifndef UNITY_BEGIN #ifndef UNITY_BEGIN
#define UNITY_BEGIN() {UnityBegin(); Unity.TestFile = __FILE__;} #define UNITY_BEGIN() UnityBegin(__FILE__)
#endif #endif
#ifndef UNITY_END #ifndef UNITY_END

4
test/rakefile_helper.rb
View File

@ -172,12 +172,12 @@ module RakefileHelpers
def report_summary def report_summary
summary = UnityTestSummary.new summary = UnityTestSummary.new
summary.set_root_path(UNITY_ROOT ) summary.set_root_path(UNITY_ROOT)
results_glob = "#{$cfg['compiler']['build_path']}*.test*" results_glob = "#{$cfg['compiler']['build_path']}*.test*"
results_glob.gsub!(/\\/, '/') results_glob.gsub!(/\\/, '/')
results = Dir[results_glob] results = Dir[results_glob]
summary.set_targets(results) summary.set_targets(results)
summary.run report summary.run
end end
def run_tests(test_files) def run_tests(test_files)