3rd-party/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-01-23 08:25:58 +01:00
Code Issues Releases Wiki Activity

Revised internal type naming scheme to better sandbox Unity away from everything else. Sure, short was nice, but not at the expense of naming collisions.

Browse Source
This commit is contained in:
Mark VanderVoord
2016-11-29 08:38:51 -05:00
parent b77c6b833f
commit 8e31f5d869
7 changed files with 396 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extras/fixture/src/unity_fixture.c
View File

@@ -9,7 +9,7 @@
#include "unity_fixture.h"
#include "unity_internals.h"
struct _UnityFixture UnityFixture;
struct UNITY_FIXTURE_T UnityFixture;
/* If you decide to use the function pointer approach.
* Build with -D UNITY_OUTPUT_CHAR=outputChar and include <stdio.h>

4
extras/fixture/src/unity_fixture_internals.h
View File

@@ -13,14 +13,14 @@ extern "C"
{
#endif
struct _UnityFixture
struct UNITY_FIXTURE_T
{
int Verbose;
unsigned int RepeatCount;
const char* NameFilter;
const char* GroupFilter;
};
extern struct _UnityFixture UnityFixture;
extern struct UNITY_FIXTURE_T UnityFixture;
typedef void unityfunction(void);
void UnityTestRunner(unityfunction* setup,

6
extras/fixture/test/unity_fixture_Test.c
View File

@@ -138,8 +138,8 @@ TEST(UnityFixture, FreeNULLSafety)
TEST(UnityFixture, ConcludeTestIncrementsFailCount)
{
_U_UINT savedFails = Unity.TestFailures;
_U_UINT savedIgnores = Unity.TestIgnores;
UNITY_UINT savedFails = Unity.TestFailures;
UNITY_UINT savedIgnores = Unity.TestIgnores;
UnityOutputCharSpy_Enable(1);
Unity.CurrentTestFailed = 1;
UnityConcludeFixtureTest(); /* Resets TestFailed for this test to pass */
@@ -301,7 +301,7 @@ TEST(UnityCommandOptions, GroupOrNameFilterWithoutStringFails)
TEST(UnityCommandOptions, GroupFilterReallyFilters)
{
_U_UINT saved = Unity.NumberOfTests;
UNITY_UINT saved = Unity.NumberOfTests;
TEST_ASSERT_EQUAL(0, UnityGetCommandLineOptions(4, unknownCommand));
UnityIgnoreTest(NULL, "non-matching", NULL);
TEST_ASSERT_EQUAL(saved, Unity.NumberOfTests);