Skip to content

Commit 15a0fa0

Browse files
jgonzalezdrjgonzalezdr
committed
Changed call order related method parameters and class attributes to use unsigned integers.
1 parent 769f9e8 commit 15a0fa0

15 files changed

+39
-39
lines changed

‎include/CppUTestExt/MockActualCall.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class MockActualCall
4242
virtual ~MockActualCall();
4343

4444
virtual MockActualCall& withName(const SimpleString& name)=0;
45-
virtual MockActualCall& withCallOrder(int callOrder)=0;
45+
virtual MockActualCall& withCallOrder(unsigned int callOrder)=0;
4646
MockActualCall& withParameter(const SimpleString& name, bool value) { return withBoolParameter(name, value); }
4747
MockActualCall& withParameter(const SimpleString& name, int value) { return withIntParameter(name, value); }
4848
MockActualCall& withParameter(const SimpleString& name, unsigned int value) { return withUnsignedIntParameter(name, value); }

‎include/CppUTestExt/MockCheckedActualCall.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
class MockCheckedActualCall : public MockActualCall
3535
{
3636
public:
37-
MockCheckedActualCall(int callOrder, MockFailureReporter* reporter, const MockExpectedCallsList& expectations);
37+
MockCheckedActualCall(unsigned int callOrder, MockFailureReporter* reporter, const MockExpectedCallsList& expectations);
3838
virtual ~MockCheckedActualCall();
3939

4040
virtual MockActualCall& withName(const SimpleString& name) _override;
41-
virtual MockActualCall& withCallOrder(int) _override;
41+
virtual MockActualCall& withCallOrder(unsigned int) _override;
4242
virtual MockActualCall& withBoolParameter(const SimpleString& name, bool value) _override;
4343
virtual MockActualCall& withIntParameter(const SimpleString& name, int value) _override;
4444
virtual MockActualCall& withUnsignedIntParameter(const SimpleString& name, unsigned int value) _override;
@@ -116,7 +116,7 @@ class MockCheckedActualCall : public MockActualCall
116116

117117
private:
118118
SimpleString functionName_;
119-
int callOrder_;
119+
unsigned int callOrder_;
120120
MockFailureReporter* reporter_;
121121

122122
ActualCallState state_;
@@ -150,7 +150,7 @@ class MockActualCallTrace : public MockActualCall
150150
virtual ~MockActualCallTrace();
151151

152152
virtual MockActualCall& withName(const SimpleString& name) _override;
153-
virtual MockActualCall& withCallOrder(int) _override;
153+
virtual MockActualCall& withCallOrder(unsigned int) _override;
154154
virtual MockActualCall& withBoolParameter(const SimpleString& name, bool value) _override;
155155
virtual MockActualCall& withIntParameter(const SimpleString& name, int value) _override;
156156
virtual MockActualCall& withUnsignedIntParameter(const SimpleString& name, unsigned int value) _override;
@@ -215,7 +215,7 @@ class MockIgnoredActualCall: public MockActualCall
215215
{
216216
public:
217217
virtual MockActualCall& withName(const SimpleString&) _override { return *this;}
218-
virtual MockActualCall& withCallOrder(int) _override { return *this; }
218+
virtual MockActualCall& withCallOrder(unsigned int) _override { return *this; }
219219
virtual MockActualCall& withBoolParameter(const SimpleString&, bool) _override { return *this; }
220220
virtual MockActualCall& withIntParameter(const SimpleString&, int) _override { return *this; }
221221
virtual MockActualCall& withUnsignedIntParameter(const SimpleString&, unsigned int) _override { return *this; }

‎include/CppUTestExt/MockCheckedExpectedCall.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class MockCheckedExpectedCall : public MockExpectedCall
3939
virtual ~MockCheckedExpectedCall();
4040

4141
virtual MockExpectedCall& withName(const SimpleString& name) _override;
42-
virtual MockExpectedCall& withCallOrder(int callOrder) _override;
42+
virtual MockExpectedCall& withCallOrder(unsigned int callOrder) _override;
4343
virtual MockExpectedCall& withBoolParameter(const SimpleString& name, bool value) _override;
4444
virtual MockExpectedCall& withIntParameter(const SimpleString& name, int value) _override;
4545
virtual MockExpectedCall& withUnsignedIntParameter(const SimpleString& name, unsigned int value) _override;
@@ -90,7 +90,7 @@ class MockCheckedExpectedCall : public MockExpectedCall
9090
virtual bool areParametersMatchingActualCall();
9191
virtual bool isOutOfOrder() const;
9292

93-
virtual void callWasMade(int callOrder);
93+
virtual void callWasMade(unsigned int callOrder);
9494
virtual void inputParameterWasPassed(const SimpleString& name);
9595
virtual void outputParameterWasPassed(const SimpleString& name);
9696
virtual void finalizeActualCallMatch();
@@ -100,8 +100,8 @@ class MockCheckedExpectedCall : public MockExpectedCall
100100
virtual SimpleString callToString();
101101
virtual SimpleString missingParametersToString();
102102

103-
enum { NOT_CALLED_YET = -1, NO_EXPECTED_CALL_ORDER = -1};
104-
virtual int getCallOrder() const;
103+
enum { NOT_CALLED_YET = 0, NO_EXPECTED_CALL_ORDER = 0 };
104+
virtual unsigned int getCallOrder() const;
105105

106106
protected:
107107
void setName(const SimpleString& name);
@@ -125,8 +125,8 @@ class MockCheckedExpectedCall : public MockExpectedCall
125125

126126
bool ignoreOtherParameters_;
127127
bool isActualCallMatchFinalized_;
128-
int actualCallOrder_;
129-
int expectedCallOrder_;
128+
unsigned int actualCallOrder_;
129+
unsigned int expectedCallOrder_;
130130
bool outOfOrder_;
131131
MockNamedValueList* inputParameters_;
132132
MockNamedValueList* outputParameters_;
@@ -143,7 +143,7 @@ class MockExpectedCallComposite : public MockExpectedCall
143143
virtual ~MockExpectedCallComposite();
144144

145145
virtual MockExpectedCall& withName(const SimpleString& name) _override;
146-
virtual MockExpectedCall& withCallOrder(int callOrder) _override;
146+
virtual MockExpectedCall& withCallOrder(unsigned int callOrder) _override;
147147
virtual MockExpectedCall& withBoolParameter(const SimpleString& name, bool value) _override;
148148
virtual MockExpectedCall& withIntParameter(const SimpleString& name, int value) _override;
149149
virtual MockExpectedCall& withUnsignedIntParameter(const SimpleString& name, unsigned int value) _override;
@@ -184,7 +184,7 @@ class MockIgnoredExpectedCall: public MockExpectedCall
184184
public:
185185

186186
virtual MockExpectedCall& withName(const SimpleString&) _override { return *this;}
187-
virtual MockExpectedCall& withCallOrder(int) _override { return *this; }
187+
virtual MockExpectedCall& withCallOrder(unsigned int) _override { return *this; }
188188
virtual MockExpectedCall& withBoolParameter(const SimpleString&, bool) _override { return *this; }
189189
virtual MockExpectedCall& withIntParameter(const SimpleString&, int) _override { return *this; }
190190
virtual MockExpectedCall& withUnsignedIntParameter(const SimpleString&, unsigned int) _override{ return *this; }

‎include/CppUTestExt/MockExpectedCall.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class MockExpectedCall
3939
virtual ~MockExpectedCall();
4040

4141
virtual MockExpectedCall& withName(const SimpleString& name)=0;
42-
virtual MockExpectedCall& withCallOrder(int)=0;
42+
virtual MockExpectedCall& withCallOrder(unsigned int)=0;
4343
MockExpectedCall& withParameter(const SimpleString& name, bool value) { return withBoolParameter(name, value); }
4444
MockExpectedCall& withParameter(const SimpleString& name, int value) { return withIntParameter(name, value); }
4545
MockExpectedCall& withParameter(const SimpleString& name, unsigned int value) { return withUnsignedIntParameter(name, value); }

‎include/CppUTestExt/MockExpectedCallsList.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class MockExpectedCallsList
6969
virtual MockCheckedExpectedCall* getFirstMatchingExpectation();
7070

7171
virtual void resetActualCallMatchingState();
72-
virtual void callWasMade(int callOrder);
72+
virtual void callWasMade(unsigned int callOrder);
7373
virtual void wasPassedToObject();
7474
virtual void parameterWasPassed(const SimpleString& parameterName);
7575
virtual void outputParameterWasPassed(const SimpleString& parameterName);
@@ -91,7 +91,7 @@ class MockExpectedCallsList
9191
: expectedCall_(expectedCall), next_(NULL) {}
9292
};
9393

94-
virtual MockExpectedCallsListNode* findNodeWithCallOrderOf(int callOrder) const;
94+
virtual MockExpectedCallsListNode* findNodeWithCallOrderOf(unsigned int callOrder) const;
9595
private:
9696
MockExpectedCallsListNode* head_;
9797

‎include/CppUTestExt/MockSupport.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class MockSupport
4848
virtual void strictOrder();
4949
virtual MockExpectedCall& expectOneCall(const SimpleString& functionName);
5050
virtual void expectNoCall(const SimpleString& functionName);
51-
virtual MockExpectedCall& expectNCalls(int amount, const SimpleString& functionName);
51+
virtual MockExpectedCall& expectNCalls(unsigned int amount, const SimpleString& functionName);
5252
virtual MockActualCall& actualCall(const SimpleString& functionName);
5353
virtual bool hasReturnValue();
5454
virtual MockNamedValue returnValue();
@@ -124,8 +124,8 @@ class MockSupport
124124
void countCheck();
125125

126126
private:
127-
int actualCallOrder_;
128-
int expectedCallOrder_;
127+
unsigned int actualCallOrder_;
128+
unsigned int expectedCallOrder_;
129129
bool strictOrdering_;
130130
MockFailureReporter *activeReporter_;
131131
MockFailureReporter *standardReporter_;

‎include/CppUTestExt/MockSupport_c.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ struct SMockSupport_c
150150
void (*strictOrder)(void);
151151
MockExpectedCall_c* (*expectOneCall)(const char* name);
152152
void (*expectNoCall)(const char* name);
153-
MockExpectedCall_c* (*expectNCalls)(int number, const char* name);
153+
MockExpectedCall_c* (*expectNCalls)(unsigned int number, const char* name);
154154
MockActualCall_c* (*actualCall)(const char* name);
155155
int (*hasReturnValue)(void);
156156
MockValue_c (*returnValue)(void);

‎src/CppUTestExt/MockActualCall.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ SimpleString MockCheckedActualCall::getName() const
4949
return functionName_;
5050
}
5151

52-
MockCheckedActualCall::MockCheckedActualCall(int callOrder, MockFailureReporter* reporter, const MockExpectedCallsList& allExpectations)
52+
MockCheckedActualCall::MockCheckedActualCall(unsigned int callOrder, MockFailureReporter* reporter, const MockExpectedCallsList& allExpectations)
5353
: callOrder_(callOrder), reporter_(reporter), state_(CALL_SUCCEED), matchingExpectation_(NULL), allExpectations_(allExpectations), outputParameterExpectations_(NULL)
5454
{
5555
potentiallyMatchingExpectations_.addPotentiallyMatchingExpectations(allExpectations);
@@ -153,7 +153,7 @@ MockActualCall& MockCheckedActualCall::withName(const SimpleString& name)
153153
return *this;
154154
}
155155

156-
MockActualCall& MockCheckedActualCall::withCallOrder(int)
156+
MockActualCall& MockCheckedActualCall::withCallOrder(unsigned int)
157157
{
158158
return *this;
159159
}
@@ -574,7 +574,7 @@ MockActualCall& MockActualCallTrace::withName(const SimpleString& name)
574574
return *this;
575575
}
576576

577-
MockActualCall& MockActualCallTrace::withCallOrder(int callOrder)
577+
MockActualCall& MockActualCallTrace::withCallOrder(unsigned int callOrder)
578578
{
579579
traceBuffer_ += " withCallOrder:";
580580
traceBuffer_ += StringFrom(callOrder);

‎src/CppUTestExt/MockExpectedCall.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ bool MockCheckedExpectedCall::isMatchingActualCall()
254254
return (actualCallOrder_ != NOT_CALLED_YET) && areParametersMatchingActualCall() && wasPassedToObject_;
255255
}
256256

257-
void MockCheckedExpectedCall::callWasMade(int callOrder)
257+
void MockCheckedExpectedCall::callWasMade(unsigned int callOrder)
258258
{
259259
actualCallOrder_ = callOrder;
260260
if (expectedCallOrder_ == NO_EXPECTED_CALL_ORDER)
@@ -495,12 +495,12 @@ MockNamedValue MockCheckedExpectedCall::returnValue()
495495
return returnValue_;
496496
}
497497

498-
int MockCheckedExpectedCall::getCallOrder() const
498+
unsigned int MockCheckedExpectedCall::getCallOrder() const
499499
{
500500
return actualCallOrder_;
501501
}
502502

503-
MockExpectedCall& MockCheckedExpectedCall::withCallOrder(int callOrder)
503+
MockExpectedCall& MockCheckedExpectedCall::withCallOrder(unsigned int callOrder)
504504
{
505505
expectedCallOrder_ = callOrder;
506506
return *this;
@@ -549,7 +549,7 @@ MockExpectedCall& MockExpectedCallComposite::withName(const SimpleString& name)
549549
return *this;
550550
}
551551

552-
MockExpectedCall& MockExpectedCallComposite::withCallOrder(int)
552+
MockExpectedCall& MockExpectedCallComposite::withCallOrder(unsigned int)
553553
{
554554
FAIL("withCallOrder not supported for CompositeCalls");
555555
return *this; // LCOV_EXCL_LINE

‎src/CppUTestExt/MockExpectedCallsList.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ void MockExpectedCallsList::resetActualCallMatchingState()
285285
p->expectedCall_->resetActualCallMatchingState();
286286
}
287287

288-
void MockExpectedCallsList::callWasMade(int callOrder)
288+
void MockExpectedCallsList::callWasMade(unsigned int callOrder)
289289
{
290290
for (MockExpectedCallsListNode* p = head_; p; p = p->next_)
291291
p->expectedCall_->callWasMade(callOrder);
@@ -310,7 +310,7 @@ void MockExpectedCallsList::outputParameterWasPassed(const SimpleString& paramet
310310
p->expectedCall_->outputParameterWasPassed(parameterName);
311311
}
312312

313-
MockExpectedCallsList::MockExpectedCallsListNode* MockExpectedCallsList::findNodeWithCallOrderOf(int callOrder) const
313+
MockExpectedCallsList::MockExpectedCallsListNode* MockExpectedCallsList::findNodeWithCallOrderOf(unsigned int callOrder) const
314314
{
315315
for (MockExpectedCallsListNode* p = head_; p; p = p->next_)
316316
if (p->expectedCall_->getCallOrder() == callOrder && p->expectedCall_->isFulfilled())
@@ -351,7 +351,7 @@ SimpleString MockExpectedCallsList::fulfilledCallsToString(const SimpleString& l
351351
SimpleString str;
352352

353353
MockExpectedCallsListNode* nextNodeInOrder;
354-
for (int callOrder = 1; (nextNodeInOrder = findNodeWithCallOrderOf(callOrder)); callOrder++)
354+
for (unsigned int callOrder = 1; (nextNodeInOrder = findNodeWithCallOrderOf(callOrder)); callOrder++)
355355
if (nextNodeInOrder)
356356
str = appendStringOnANewLine(str, linePrefix, nextNodeInOrder->expectedCall_->callToString());
357357

0 commit comments

Comments
 (0)