Added support for generating Unity style tests #9
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 12 commits
November 29, 2016 11:54
… used by the Unity test generation
Updated unit tests to reflect the Unity style
Now pass in either "unity" or "simple" to use the two generators. Updated tests to pass in unity.
Updated tests to use these new asserts
This allows chartacer returns to look more correct and makes the assertions more precise.
Unions currently do not work - this test demonstrates this https://github.com/diffblue/verification-engine-utils/issues/355
thk123
commented
Nov 29, 2016
| @@ -305,9 +306,10 @@ bool bmc_covert::operator()() | |||
| for(const auto & it : goal_map) | |||
| if(it.second.satisfied) goals_covered++; | |||
|
|
|||
| if (bmc.options.get_bool_option("gen-c-test-case")) | |||
| if (bmc.options.get_option("gen-c-test-case") != "") | |||
| { | ||
|
|
||
| std::string generator_str = bmc.options.get_option("gen-c-test-case"); |
| c_simple_test_case_generatort gen(get_message_handler(), bmc.options, | ||
| bmc.ns.get_symbol_table(), goto_functions, test, test_case_no, true); | ||
| std::unique_ptr<c_test_case_generatort> gen; | ||
| if(generator_str == "unity") |
| @@ -48,11 +49,14 @@ class c_test_case_generatort : public messaget | |||
|
|
|||
| protected: | |||
| virtual void add_includes(c_test_filet &test_file); | |||
| virtual void add_main_method(c_test_filet &test_file, | |||
| virtual void add_main_method(class c_test_filet &test_file, | |||
| #include <algorithm> | ||
| #include <util/config.h> | ||
|
|
||
| c_unity_test_case_generatort::c_unity_test_case_generatort(message_handlert &_message_handler, |
| size_t test_index, | ||
| bool using_test_main) | ||
| : c_test_case_generatort(_message_handler, options, symbol_table, | ||
| goto_functions, test, test_index, using_test_main) |
There was a problem hiding this comment.
Each of these should be on a separate line.
| included inside this file | ||
| \*******************************************************************/ | ||
| void c_unity_test_case_generatort::add_main_method(c_test_filet &test_file, | ||
| const testt &test) |
| return_value_var - The name of the variable (including relevant nesting) | ||
| Purpose: Add an assertion for a unity expression | ||
| \*******************************************************************/ | ||
| void c_unity_test_case_generatort::add_simple_assert(c_test_filet &test_file, |
| class c_unity_test_case_generatort : public c_test_case_generatort | ||
| { | ||
| public: | ||
| c_unity_test_case_generatort(message_handlert &_message_handler, |
|
|
||
| protected: | ||
| virtual void add_includes(class c_test_filet &test_file) override; | ||
| virtual void add_main_method(class c_test_filet &test_file, |
thk123
force-pushed
the
unity-test-generation
branch
from
d69dfd5 to
33a98bb
Compare
peterschrammel
requested changes
Nov 29, 2016
| const testt &test, | ||
| size_t test_index, | ||
| bool using_test_main) | ||
| : c_test_case_generatort( |
There was a problem hiding this comment.
put colon on the previous line; "c_test_case_generator(" is aligned with bool; its arguments are indented (as they are already)
added 2 commits
November 29, 2016 15:10
Fixed white space and other linting errors in lines touched by this PR.
thk123
force-pushed
the
unity-test-generation
branch
from
33a98bb to
eed8e8a
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added a new class to generate Unity style tests. These include nice reporting of whether the test passes or fails as well as handling more sophisticated assertions.
Most of the regression files are modified as the format of the test is different.