Skip to content

Make CMock_Verify() available as UnityRunner_Verify() #455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Make CMock_Verify() available as UnityRunner_Verify() #455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions auto/generate_test_runner.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ def create_externs(output, tests, _mocks)

def create_mock_management(output, mock_headers)
output.puts("\n/*=======Mock Management=====*/")
output.puts('static void CMock_Init(void)')
output.puts('void UnityRunner_Init(void)')
output.puts('{')

if @options[:enforce_strict_ordering]
Expand All @@ -247,15 +247,15 @@ def create_mock_management(output, mock_headers)
end
output.puts("}\n")

output.puts('static void CMock_Verify(void)')
output.puts('void UnityRunner_Verify(void)')
output.puts('{')
mocks.each do |mock|
mock_clean = TypeSanitizer.sanitize_c_identifier(mock)
output.puts(" #{mock_clean}_Verify();")
end
output.puts("}\n")

output.puts('static void CMock_Destroy(void)')
output.puts('void UnityRunner_Destroy(void)')
output.puts('{')
mocks.each do |mock|
mock_clean = TypeSanitizer.sanitize_c_identifier(mock)
Expand Down Expand Up @@ -300,9 +300,9 @@ def create_reset(output)
output.puts("void #{@options[:test_reset_name]}(void)")
output.puts('{')
output.puts(" #{@options[:teardown_name]}();")
output.puts(' CMock_Verify();')
output.puts(' CMock_Destroy();')
output.puts(' CMock_Init();')
output.puts(' UnityRunner_Verify();')
output.puts(' UnityRunner_Destroy();')
output.puts(' UnityRunner_Init();')
output.puts(" #{@options[:setup_name]}();")
output.puts('}')
end
Expand Down
6 changes: 3 additions & 3 deletions auto/run_test.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ static void run_test(UnityTestFunction func, const char* name, int line_num)
Unity.NumberOfTests++;
UNITY_CLR_DETAILS();
UNITY_EXEC_TIME_START();
CMock_Init();
UnityRunner_Init();
if (TEST_PROTECT())
{
<% if @options[:plugins].include?(:cexception) %>
Expand All @@ -28,9 +28,9 @@ static void run_test(UnityTestFunction func, const char* name, int line_num)
if (TEST_PROTECT())
{
<%= @options[:teardown_name] %>();
CMock_Verify();
UnityRunner_Verify();
}
CMock_Destroy();
UnityRunner_Destroy();
UNITY_EXEC_TIME_STOP();
UnityConcludeTest();
}
9 changes: 9 additions & 0 deletions src/unity.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@ void tearDown(void);
void suiteSetUp(void);
int suiteTearDown(int num_failures);

/*-------------------------------------------------------
* Test Runner Interface
*-------------------------------------------------------*/

/* These functions are provided by the generated test runner. */
void UnityRunner_Init(void);
void UnityRunner_Verify(void);
void UnityRunner_Destroy(void);

/*-------------------------------------------------------
* Configuration Options
*-------------------------------------------------------
Expand Down