8000 Merge pull request #93 from unittest-cpp/uncrustify · unittest-cpp/unittest-cpp@6bfab53 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6bfab53

Browse files
pjohnmeyerpjohnmeyer
committed
Merge pull request #93 from unittest-cpp/uncrustify
Make formatting more consistent
2 parents 6e1d0f4 + bb7555c commit 6bfab53

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+5330
-4880
lines changed

‎.uncrustify

Lines changed: 488 additions & 0 deletions
Large diffs are not rendered by default.

‎UnitTest++/AssertException.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@
44

55
namespace UnitTest {
66

7-
AssertException::AssertException()
8-
{
9-
}
7+
AssertException::AssertException()
8+
{}
109

11-
AssertException::~AssertException() throw()
12-
{
13-
}
10+
AssertException::~AssertException() throw()
11+
{}
1412

1513
}
1614

‎UnitTest++/AssertException.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99

1010
namespace UnitTest {
1111

12-
class UNITTEST_LINKAGE AssertException : public std::exception
13-
{
14-
public:
15-
AssertException();
16-
virtual ~AssertException() throw();
17-
};
12+
class UNITTEST_LINKAGE AssertException : public std::exception
13+
{
14+
public:
15+
AssertException();
16+
virtual ~AssertException() throw();
17+
};
1818

1919
}
2020

‎UnitTest++/CheckMacros.h

Lines changed: 146 additions & 144 deletions
Large diffs are not rendered by default.

‎UnitTest++/Checks.cpp

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,48 +3,48 @@
33

44
namespace UnitTest {
55

6-
namespace {
7-
8-
void CheckStringsEqual(TestResults& results, char const* expected, char const* actual,
9-
TestDetails const& details)
10-
{
11-
using namespace std;
12-
13-
if ((expected && actual) ? strcmp(expected, actual) : (expected || actual))
14-
{
15-
UnitTest::MemoryOutStream stream;
16-
stream << "Expected " << (expected ? expected : "<NULLPTR>") << " but was " << (actual ? actual : "<NULLPTR>");
17-
18-
results.OnTestFailure(details, stream.GetText());
19-
}
20-
}
21-
22-
}
23-
24-
25-
void CheckEqual(TestResults& results, char const* expected, char const* actual,
26-
TestDetails const& details)
27-
{
28-
CheckStringsEqual(results, expected, actual, details);
29-
}
30-
31-
void CheckEqual(TestResults& results, char* expected, char* actual,
32-
TestDetails const& details)
33-
{
34-
CheckStringsEqual(results, expected, actual, details);
35-
}
36-
37-
void CheckEqual(TestResults& results, char* expected, char const* actual,
38-
TestDetails const& details)
39-
{
40-
CheckStringsEqual(results, expected, actual, details);
41-
}
42-
43-
void CheckEqual(TestResults& results, char const* expected, char* actual,
44-
TestDetails const& details)
45-
{
46-
CheckStringsEqual(results, expected, actual, details);
47-
}
6+
namespace {
7+
8+
void CheckStringsEqual(TestResults& results, char const* expected, char const* actual,
9+
TestDetails const& details)
10+
{
11+
using namespace std;
12+
13+
if ((expected && actual) ? strcmp(expected, actual) : (expected || actual))
14+
{
15+
UnitTest::MemoryOutStream stream;
16+
stream << "Expected " << (expected ? expected : "<NULLPTR>") << " but was " << (actual ? actual : "<NULLPTR>");
17+
18+
results.OnTestFailure(details, stream.GetText());
19+
}
20+
}
21+
22+
}
23+
24+
25+
void CheckEqual(TestResults& results, char const* expected, char const* actual,
26+
TestDetails const& details)
27+
{
28+
CheckStringsEqual(results, expected, actual, details);
29+
}
30+
31+
void CheckEqual(TestResults& results, char* expected, char* actual,
32+
TestDetails const& details)
33+
{
34+
CheckStringsEqual(results, expected, actual, details);
35+
}
36+
37+
void CheckEqual(TestResults& results, char* expected, char const* actual,
38+
TestDetails const& details)
39+
{
40+
CheckStringsEqual(results, expected, actual, details);
41+
}
42+
43+
void CheckEqual(TestResults& results, char const* expected, char* actual,
44+
TestDetails const& details)
45+
{
46+
CheckStringsEqual(results, expected, actual, details);
47+
}
4848

4949

5050
}

‎UnitTest++/Checks.h

Lines changed: 107 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -8,150 +8,150 @@
88
namespace UnitTest {
99

1010

11-
template< typename Value >
12-
bool Check(Value const value)
13-
{
14-
return !!value; // doing double negative to avoid silly VS warnings
15-
}
11+
template< typename Value >
12+
bool Check(Value const value)
13+
{
14+
return !!value; // doing double negative to avoid silly VS warnings
15+
}
1616

1717

18-
template< typename Expected, typename Actual >
19-
void CheckEqual(TestResults& results, Expected const& expected, Actual const& actual, TestDetails const& details)
20-
{
21-
if (!(expected == actual))
22-
{
23-
UnitTest::MemoryOutStream stream;
24-
stream << "Expected " << expected << " but was " << actual;
18+
template< typename Expected, typename Actual >
19+
void CheckEqual(TestResults& results, Expected const& expected, Actual const& actual, TestDetails const& details)
20+
{
21+
if (!(expected == actual))
22+
{
23+
UnitTest::MemoryOutStream stream;
24+
stream << "Expected " << expected << " but was " << actual;
2525

26-
results.OnTestFailure(details, stream.GetText());
27-
}
28-
}
26+
results.OnTestFailure(details, stream.GetText());
27+
}
28+
}
2929

30-
UNITTEST_LINKAGE void CheckEqual(TestResults& results, char const* expected, char const* actual, TestDetails const& details);
30+
UNITTEST_LINKAGE void CheckEqual(TestResults& results, char const* expected, char const* actual, TestDetails const& details);
3131

32-
UNITTEST_LINKAGE void CheckEqual(TestResults& results, char* expected, char* actual, TestDetails const& details);
32+
UNITTEST_LINKAGE void CheckEqual(TestResults& results, char* expected, char* actual, TestDetails const& details);
3333

34-
UNITTEST_LINKAGE void CheckEqual(TestResults& results, char* expected, char const* actual, TestDetails const& details);
34+
UNITTEST_LINKAGE void CheckEqual(TestResults& results, char* expected, char const* actual, TestDetails const& details);
3535

36-
UNITTEST_LINKAGE void CheckEqual(TestResults& results, char const* expected, char* actual, TestDetails const& details);
36+
UNITTEST_LINKAGE void CheckEqual(TestResults& results, char const* expected, char* actual, TestDetails const& details);
3737

38-
template< typename Expected, typename Actual, typename Tolerance >
39-
bool AreClose(Expected const& expected, Actual const& actual, Tolerance const& tolerance)
40-
{
41-
return (actual >= (expected - tolerance)) && (actual <= (expected + tolerance));
42-
}
38+
template< typename Expected, typename Actual, typename Tolerance >
39+
bool AreClose(Expected const& expected, Actual const& actual, Tolerance const& tolerance)
40+
{
41+
return (actual >= (expected - tolerance)) && (actual <= (expected + tolerance));
42+
}
4343

44-
template< typename Expected, typename Actual, typename Tolerance >
45-
void CheckClose(TestResults& results, Expected const& expected, Actual const& actual, Tolerance const& tolerance,
46-
TestDetails const& details)
47-
{
48-
if (!AreClose(expected, actual, tolerance))
49-
{
50-
UnitTest::MemoryOutStream stream;
51-
stream << "Expected " << expected << " +/- " << tolerance << " but was " << actual;
52-
53-
results.OnTestFailure(details, stream.GetText());
54-
}
55-
}
44+
template< typename Expected, typename Actual, typename Tolerance >
45+
void CheckClose(TestResults& results, Expected const& expected, Actual const& actual, Tolerance const& tolerance,
46+
TestDetails const& details)
47+
{
48+
if (!AreClose(expected, actual, tolerance))
49+
{
50+
UnitTest::MemoryOutStream stream;
51+
stream << "Expected " << expected << " +/- " << tolerance << " but was " << actual;
5652

53+
results.OnTestFailure(details, stream.GetText());
54+
}
55+
}
5756

58-
template< typename Expected, typename Actual >
59-
void CheckArrayEqual(TestResults& results, Expected const& expected, Actual const& actual,
60-
int const count, TestDetails const& details)
61-
{
62-
bool equal = true;
63-
for (int i = 0; i < count; ++i)
64-
equal &= (expected[i] == actual[i]);
6557

66-
if (!equal)
67-
{
68-
UnitTest::MemoryOutStream stream;
58+
template< typename Expected, typename Actual >
59+
void CheckArrayEqual(TestResults& results, Expected const& expected, Actual const& actual,
60+
int const count, TestDetails const& details)
61+
{
62+
bool equal = true;
63+
for (int i = 0; i < count; ++i)
64+
equal &= (expected[i] == actual[i]);
6965

70-
stream << "Expected [ ";
66+
if (!equal)
67+
{
68+
UnitTest::MemoryOutStream stream;
7169

72-
for (int expectedIndex = 0; expectedIndex < count; ++expectedIndex)
70+
stream << "Expected [ ";
71+
72+
for (int expectedIndex = 0; expectedIndex < count; ++expectedIndex)
7373
stream << expected[expectedIndex] << " ";
7474

75-
stream << "] but was [ ";
75+
stream << "] but was [ ";
7676

77-
for (int actualIndex = 0; actualIndex < count; ++actualIndex)
77+
for (int actualIndex = 0; actualIndex < count; ++actualIndex)
7878
stream << actual[actualIndex] << " ";
7979

80-
stream << "]";
81-
82-
results.OnTestFailure(details, stream.GetText());
83-
}
84-
}
85-
86-
template< typename Expected, typename Actual, typename Tolerance >
87-
bool ArrayAreClose(Expected const& expected, Actual const& actual, int const count, Tolerance const& tolerance)
88-
{
89-
bool equal = true;
90-
for (int i = 0; i < count; ++i)
91-
equal &= AreClose(expected[i], actual[i], tolerance);
92-
return equal;
93-
}
94-
95-
template< typename Expected, typename Actual, typename Tolerance >
96-
void CheckArrayClose(TestResults& results, Expected const& expected, Actual const& actual,
97-
int const count, Tolerance const& tolerance, TestDetails const& details)
98-
{
99-
bool equal = ArrayAreClose(expected, actual, count, tolerance);
100-
101-
if (!equal)
102-
{
103-
UnitTest::MemoryOutStream stream;
104-
105-
stream << "Expected [ ";
106-
for (int expectedIndex = 0; expectedIndex < count; ++expectedIndex)
80+
stream << "]";
81+
82+
results.OnTestFailure(details, stream.GetText());
83+
}
84+
}
85+
86+
template< typename Expected, typename Actual, typename Tolerance >
87+
bool ArrayAreClose(Expected const& expected, Actual const& actual, int const count, Tolerance const& tolerance)
88+
{
89+
bool equal = true;
90+
for (int i = 0; i < count; ++i)
91+
equal &= AreClose(expected[i], actual[i], tolerance);
92+
return equal;
93+
}
94+
95+
template< typename Expected, typename Actual, typename Tolerance >
96+
void CheckArrayClose(TestResults& results, Expected const& expected, Actual const& actual,
97+
int const count, Tolerance const& tolerance, TestDetails const& details)
98+
{
99+
bool equal = ArrayAreClose(expected, actual, count, tolerance);
100+
101+
if (!equal)
102+
{
103+
UnitTest::MemoryOutStream stream;
104+
105+
stream << "Expected [ ";
106+
for (int expectedIndex = 0; expectedIndex < count; ++expectedIndex)
107107
stream << expected[expectedIndex] << " ";
108-
stream << "] +/- " << tolerance << " but was [ ";
108+
stream << "] +/- " << tolerance << " but was [ ";
109109

110-
for (int actualIndex = 0; actualIndex < count; ++actualIndex)
110+
for (int actualIndex = 0; actualIndex < count; ++actualIndex)
111111
stream << actual[actualIndex] << " ";
112-
stream << "]";
112+
stream << "]";
113113

114-
results.OnTestFailure(details, stream.GetText());
115-
}
116-
}
114+
results.OnTestFailure(details, stream.GetText());
115+
}
116+
}
117117

118-
template< typename Expected, typename Actual, typename Tolerance >
119-
void CheckArray2DClose(TestResults& results, Expected const& expected, Actual const& actual,
120-
int const rows, int const columns, Tolerance const& tolerance, TestDetails const& details)
121-
{
122-
bool equal = true;
123-
for (int i = 0; i < rows; ++i)
124-
equal &= ArrayAreClose(expected[i], actual[i], columns, tolerance);
118+
template< typename Expected, typename Actual, typename Tolerance >
119+
void CheckArray2DClose(TestResults& results, Expected const& expected, Actual const& actual,
120+
int const rows, int const columns, Tolerance const& tolerance, TestDetails const& details)
121+
{
122+
bool equal = true;
123+
for (int i = 0; i < rows; ++i)
124+
equal &= ArrayAreClose(expected[i], actual[i], columns, tolerance);
125125

126-
if (!equal)
127-
{
128-
UnitTest::MemoryOutStream stream;
126+
if (!equal)
127+
{
128+
UnitTest::MemoryOutStream stream;
129129

130-
stream << "Expected [ ";
130+
stream << "Expected [ ";
131131

132-
for (int expectedRow = 0; expectedRow < rows; ++expectedRow)
133-
{
132+
for (int expectedRow = 0; expectedRow < rows; ++expectedRow)
133+
{
134134
stream << "[ ";
135135
for (int expectedColumn = 0; expectedColumn < columns; ++expectedColumn)
136-
stream << expected[expectedRow][expectedColumn] << " ";
136+
stream << expected[expectedRow][expectedColumn] << " ";
137137
stream << "] ";
138-
}
138+
}
139139

140-
stream << "] +/- " << tolerance << " but was [ ";
140+
stream << "] +/- " << tolerance << " but was [ ";
141141

142-
for (int actualRow = 0; actualRow < rows; ++actualRow)
143-
{
142+
for (int actualRow = 0; actualRow < rows; ++actualRow)
143+
{
144144
stream << "[ ";
145145
for (int actualColumn = 0; actualColumn < columns; ++actualColumn)
146-
stream << actual[actualRow][actualColumn] << " ";
146+
stream << actual[actualRow][actualColumn] << " ";
147147
stream << "] ";
148-
}
148+
}
149149

150-
stream << "]";
150+
stream << "]";
151151

152-
results.OnTestFailure(details, stream.GetText());
153-
}
154-
}
152+
results.OnTestFailure(details, stream.GetText());
153+
}
154+
}
155155

156156
}
157157

0 commit comments

Comments
 (0)
0