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

- added message support to NULL macros

Browse Source 
- tweaked runner generator to use symbols for cexception like everything else.

git-svn-id: http://unity.svn.sourceforge.net/svnroot/unity/trunk@56 e7d17a6e-8845-0410-bbbc-c8efb4fdad7e
This commit is contained in:
mvandervoord
2010-03-08 13:31:11 +00:00
parent 836ae000d0
commit 91de19e504
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
auto/generate_test_runner.rb
View File

@ -17,7 +17,7 @@ class UnityTestRunnerGenerator
require 'yaml'
yaml_guts = YAML.load_file(config_file)
yaml_goodness = yaml_guts[:unity] ? yaml_guts[:unity] : yaml_guts[:cmock]
options[:cexception] = 1 if (yaml_goodness[:plugins].include? 'cexception')
options[:cexception] = 1 if (yaml_goodness[:plugins].include? :cexception)
options[:coverage ] = 1 if (yaml_goodness[:coverage])
options[:order] = 1 if (yaml_goodness[:enforce_strict_ordering])
options[:includes] << (yaml_goodness[:includes])
@ -95,6 +95,7 @@ class UnityTestRunnerGenerator
def create_header(output, mocks)
output.puts('/* AUTOGENERATED FILE. DO NOT EDIT. */')
output.puts('#include "unity.h"')
output.puts('#include "cmock.h"')
@options[:includes].flatten.each do |includes|
output.puts("#include \"#{includes.gsub('.h','')}.h\"")
end

4
src/unity.h
View File

@ -211,7 +211,7 @@ void UnityAssertFloatsWithin(const _UF delta,
// these are the macros you are looking for
#define TEST_ASSERT_MESSAGE(condition, message) if (condition) {} else {TEST_FAIL(message);}
#define TEST_ASSERT(condition) TEST_ASSERT_MESSAGE(condition, NULL)
#define TEST_ASSERT(condition) TEST_ASSERT_MESSAGE(condition, "Expectation Failed.")
#define TEST_ASSERT_TRUE_MESSAGE(condition, message) TEST_ASSERT_MESSAGE(condition, message)
#define TEST_ASSERT_TRUE(condition) TEST_ASSERT_MESSAGE(condition, "Expected TRUE was FALSE.")
@ -223,7 +223,9 @@ void UnityAssertFloatsWithin(const _UF delta,
#define TEST_ASSERT_FALSE(condition) TEST_ASSERT_MESSAGE(!(condition), "Expected FALSE was TRUE.")
#define TEST_ASSERT_NULL(pointer) TEST_ASSERT_MESSAGE(pointer == NULL, #pointer " was not null.")
#define TEST_ASSERT_NULL_MESSAGE(pointer, message) TEST_ASSERT_MESSAGE(pointer == NULL, message)
#define TEST_ASSERT_NOT_NULL(pointer) TEST_ASSERT_MESSAGE(pointer != NULL, #pointer " was null.")
#define TEST_ASSERT_NOT_NULL_MESSAGE(pointer, message) TEST_ASSERT_MESSAGE(pointer != NULL, message)
#define TEST_ASSERT_EQUAL_INT_MESSAGE(expected, actual, message) \
Unity.TestFile=__FILE__; \