8000 Merge pull request #128 from killoctal/useSize_t · Reification/unittest-cpp@c431be9 · GitHub
[go: up one dir, main page]
Skip to content

Commit c431be9

Browse files
pjohnmeyerpjohnmeyer
authored
Merge pull request unittest-cpp#128 from killoctal/useSize_t
Use size_t for array or vector index
2 parents 83dbcc0 + eca0393 commit c431be9

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

‎UnitTest++/Checks.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ namespace UnitTest {
5757

5858
template< typename Expected, typename Actual >
5959
void CheckArrayEqual(TestResults& results, Expected const& expected, Actual const& actual,
60-
int const count, TestDetails const& details)
60+
size_t const count, TestDetails const& details)
6161
{
6262
bool equal = true;
63-
for (int i = 0; i < count; ++i)
63+
for (size_t i = 0; i < count; ++i)
6464
equal &= (expected[i] == actual[i]);
6565

6666
if (!equal)
@@ -69,12 +69,12 @@ namespace UnitTest {
6969

7070
stream << "Expected [ ";
7171

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

7575
stream << "] but was [ ";
7676

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

8080
stream << "]";
@@ -84,17 +84,17 @@ namespace UnitTest {
8484
}
8585

8686
template< typename Expected, typename Actual, typename Tolerance >
87-
bool ArrayAreClose(Expected const& expected, Actual const& actual, int const count, Tolerance const& tolerance)
87+
bool ArrayAreClose(Expected const& expected, Actual const& actual, size_t const count, Tolerance const& tolerance)
8888
{
8989
bool equal = true;
90-
for (int i = 0; i < count; ++i)
90+
for (size_t i = 0; i < count; ++i)
9191
equal &= AreClose(expected[i], actual[i], tolerance);
9292
return equal;
9393
}
9494

9595
template< typename Expected, typename Actual, typename Tolerance >
9696
void CheckArrayClose(TestResults& results, Expected const& expected, Actual const& actual,
97-
int const count, Tolerance const& tolerance, TestDetails const& details)
97+
size_t const count, Tolerance const& tolerance, TestDetails const& details)
9898
{
9999
bool equal = ArrayAreClose(expected, actual, count, tolerance);
100100

@@ -103,11 +103,11 @@ namespace UnitTest {
103103
UnitTest::MemoryOutStream stream;
104104

105105
stream << "Expected [ ";
106-
for (int expectedIndex = 0; expectedIndex < count; ++expectedIndex)
106+
for (size_t expectedIndex = 0; expectedIndex < count; ++expectedIndex)
107107
stream << expected[expectedIndex] << " ";
108108
stream << "] +/- " << tolerance << " but was [ ";
109109

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

@@ -117,10 +117,10 @@ namespace UnitTest {
117117

118118
template< typename Expected, typename Actual, typename Tolerance >
119119
void CheckArray2DClose(TestResults& results, Expected const& expected, Actual const& actual,
120-
int const rows, int const columns, Tolerance const& tolerance, TestDetails const& details)
120+
size_t const rows, size_t const columns, Tolerance const& tolerance, TestDetails const& details)
121121
{
122122
bool equal = true;
123-
for (int i = 0; i < rows; ++i)
123+
for (size_t i = 0; i < rows; ++i)
124124
equal &= ArrayAreClose(expected[i], actual[i], columns, tolerance);
125125

126126
if (!equal)
@@ -129,20 +129,20 @@ namespace UnitTest {
129129

130130
stream << "Expected [ ";
131131

132-
for (int expectedRow = 0; expectedRow < rows; ++expectedRow)
132+
for (size_t expectedRow = 0; expectedRow < rows; ++expectedRow)
133133
{
134134
stream << "[ ";
135-
for (int expectedColumn = 0; expectedColumn < columns; ++expectedColumn)
135+
for (size_t expectedColumn = 0; expectedColumn < columns; ++expectedColumn)
136136
stream << expected[expectedRow][expectedColumn] << " ";
137137
stream << "] ";
138138
}
139139

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

142-
for (int actualRow = 0; actualRow < rows; ++actualRow)
142+
for (size_t actualRow = 0; actualRow < rows; ++actualRow)
143143
{
144144
stream << "[ ";
145-
for (int actualColumn = 0; actualColumn < columns; ++actualColumn)
145+
for (size_t actualColumn = 0; actualColumn < columns; ++actualColumn)
146146
stream << actual[actualRow][actualColumn] << " ";
147147
stream << "] ";
148148
}

‎tests/TestExceptions.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ namespace {
253253
class ThrowingObject
254254
{
255255
public:
256-
float operator[](int) const
256+
float operator[](size_t) const
257257
{
258258
throw "Test throw";
259259
}
@@ -262,7 +262,7 @@ namespace {
262262
class StdThrowingObject
263263
{
264264
public:
265-
float operator[](int) const
265+
float operator[](size_t) const
266266
{
267267
throw std::runtime_error("Test throw");
268268
}
@@ -451,7 +451,7 @@ namespace {
451451
class ThrowingObject2D
452452
{
453453
public:
454-
float* operator[](int) const
454+
float* operator[](size_t) const
455455
{
456456
throw "Test throw";
457457
}
@@ -460,7 +460,7 @@ namespace {
460460
class StdThrowingObject2D
461461
{
462462
public:
463-
float* operator[](int) const
463+
float* operator[](size_t) const
464464
{
465465
throw std::runtime_error("Test throw");
466466
}

0 commit comments

Comments
 (0)
0