Skip to content

Commit

Permalink
Merge branch 'dev-2.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@FranckRJ
FranckRJ committed Dec 16, 2022
2 parents 49b27fe + 3c36d1a commit 833e4ce
Show file tree
Hide file tree
Showing 16 changed files with 97 additions and 97 deletions.
8 changes: 4 additions & 4 deletions include/fakeit/MethodMockingContext.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ namespace fakeit {
: _impl{new Implementation(stubbingContext)} {
}

MethodMockingContext(MethodMockingContext &) = default;
MethodMockingContext(const MethodMockingContext &) = default;

//we have to write move ctor by hand since VC 2013 doesn't support defaulted
//move constructor and move assignment
Expand Down Expand Up @@ -286,7 +286,7 @@ namespace fakeit {
: MethodMockingContext<R, arglist...>(stubbingContext) {
}

MockingContext(MockingContext &) = default;
MockingContext(const MockingContext &) = default;

MockingContext(MockingContext &&other)
: MethodMockingContext<R, arglist...>(std::move(other)) {
Expand Down Expand Up @@ -346,7 +346,7 @@ namespace fakeit {
: MethodMockingContext<void, arglist...>(stubbingContext) {
}

MockingContext(MockingContext &) = default;
MockingContext(const MockingContext &) = default;

MockingContext(MockingContext &&other)
: MethodMockingContext<void, arglist...>(std::move(other)) {
Expand Down Expand Up @@ -391,7 +391,7 @@ namespace fakeit {
: MethodMockingContext<void>(stubbingContext) {
}

DtorMockingContext(DtorMockingContext &other) : MethodMockingContext<void>(other) {
DtorMockingContext(const DtorMockingContext &other) : MethodMockingContext<void>(other) {
}

DtorMockingContext(DtorMockingContext &&other) : MethodMockingContext<void>(std::move(other)) {
Expand Down
2 changes: 1 addition & 1 deletion include/fakeit/VerifyNoOtherInvocationsVerificationProgress.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ namespace fakeit {
_isVerified(false) {
}

VerifyNoOtherInvocationsExpectation(VerifyNoOtherInvocationsExpectation &other) = default;
VerifyNoOtherInvocationsExpectation(const VerifyNoOtherInvocationsExpectation &other) = default;

void VerifyExpectation(VerificationEventHandler &verificationErrorHandler) {
if (_isVerified)
Expand Down
4 changes: 2 additions & 2 deletions include/fakeit/WhenFunctor.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace fakeit {
_xaction.commit();
}

StubbingChange(StubbingChange &other) :
StubbingChange(const StubbingChange &other) :
_xaction(other._xaction) {
}

Expand All @@ -55,7 +55,7 @@ namespace fakeit {

virtual ~MethodProgress() override = default;

MethodProgress(MethodProgress &other) :
MethodProgress(const MethodProgress &other) :
_progress(other._progress), _context(other._context) {
}

Expand Down
16 changes: 8 additions & 8 deletions single_header/boost/fakeit.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*
* FakeIt - A Simplified C++ Mocking Framework
* Copyright (c) Eran Pe'er 2013
* Generated: 2022-12-02 14:52:43.207489
* Generated: 2022-12-16 13:26:48.801805
* Distributed under the MIT License. Please refer to the LICENSE file at:
* https://github.com/eranpeer/FakeIt
*/
Expand Down Expand Up @@ -8282,7 +8282,7 @@ namespace fakeit {
: _impl{new Implementation(stubbingContext)} {
}

MethodMockingContext(MethodMockingContext &) = default;
MethodMockingContext(const MethodMockingContext &) = default;



Expand Down Expand Up @@ -8386,7 +8386,7 @@ namespace fakeit {
: MethodMockingContext<R, arglist...>(stubbingContext) {
}

MockingContext(MockingContext &) = default;
MockingContext(const MockingContext &) = default;

MockingContext(MockingContext &&other)
: MethodMockingContext<R, arglist...>(std::move(other)) {
Expand Down Expand Up @@ -8446,7 +8446,7 @@ namespace fakeit {
: MethodMockingContext<void, arglist...>(stubbingContext) {
}

MockingContext(MockingContext &) = default;
MockingContext(const MockingContext &) = default;

MockingContext(MockingContext &&other)
: MethodMockingContext<void, arglist...>(std::move(other)) {
Expand Down Expand Up @@ -8491,7 +8491,7 @@ namespace fakeit {
: MethodMockingContext<void>(stubbingContext) {
}

DtorMockingContext(DtorMockingContext &other) : MethodMockingContext<void>(other) {
DtorMockingContext(const DtorMockingContext &other) : MethodMockingContext<void>(other) {
}

DtorMockingContext(DtorMockingContext &&other) : MethodMockingContext<void>(std::move(other)) {
Expand Down Expand Up @@ -9074,7 +9074,7 @@ namespace fakeit {
_xaction.commit();
}

StubbingChange(StubbingChange &other) :
StubbingChange(const StubbingChange &other) :
_xaction(other._xaction) {
}

Expand All @@ -9096,7 +9096,7 @@ namespace fakeit {

virtual ~MethodProgress() override = default;

MethodProgress(MethodProgress &other) :
MethodProgress(const MethodProgress &other) :
_progress(other._progress), _context(other._context) {
}

Expand Down Expand Up @@ -9737,7 +9737,7 @@ namespace fakeit {
_isVerified(false) {
}

VerifyNoOtherInvocationsExpectation(VerifyNoOtherInvocationsExpectation &other) = default;
VerifyNoOtherInvocationsExpectation(const VerifyNoOtherInvocationsExpectation &other) = default;

void VerifyExpectation(VerificationEventHandler &verificationErrorHandler) {
if (_isVerified)
Expand Down
16 changes: 8 additions & 8 deletions single_header/catch/fakeit.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*
* FakeIt - A Simplified C++ Mocking Framework
* Copyright (c) Eran Pe'er 2013
* Generated: 2022-12-02 14:52:43.451177
* Generated: 2022-12-16 13:26:49.112179
* Distributed under the MIT License. Please refer to the LICENSE file at:
* https://github.com/eranpeer/FakeIt
*/
Expand Down Expand Up @@ -8320,7 +8320,7 @@ namespace fakeit {
: _impl{new Implementation(stubbingContext)} {
}

MethodMockingContext(MethodMockingContext &) = default;
MethodMockingContext(const MethodMockingContext &) = default;



Expand Down Expand Up @@ -8424,7 +8424,7 @@ namespace fakeit {
: MethodMockingContext<R, arglist...>(stubbingContext) {
}

MockingContext(MockingContext &) = default;
MockingContext(const MockingContext &) = default;

MockingContext(MockingContext &&other)
: MethodMockingContext<R, arglist...>(std::move(other)) {
Expand Down Expand Up @@ -8484,7 +8484,7 @@ namespace fakeit {
: MethodMockingContext<void, arglist...>(stubbingContext) {
}

MockingContext(MockingContext &) = default;
MockingContext(const MockingContext &) = default;

MockingContext(MockingContext &&other)
: MethodMockingContext<void, arglist...>(std::move(other)) {
Expand Down Expand Up @@ -8529,7 +8529,7 @@ namespace fakeit {
: MethodMockingContext<void>(stubbingContext) {
}

DtorMockingContext(DtorMockingContext &other) : MethodMockingContext<void>(other) {
DtorMockingContext(const DtorMockingContext &other) : MethodMockingContext<void>(other) {
}

DtorMockingContext(DtorMockingContext &&other) : MethodMockingContext<void>(std::move(other)) {
Expand Down Expand Up @@ -9112,7 +9112,7 @@ namespace fakeit {
_xaction.commit();
}

StubbingChange(StubbingChange &other) :
StubbingChange(const StubbingChange &other) :
_xaction(other._xaction) {
}

Expand All @@ -9134,7 +9134,7 @@ namespace fakeit {

virtual ~MethodProgress() override = default;

MethodProgress(MethodProgress &other) :
MethodProgress(const MethodProgress &other) :
_progress(other._progress), _context(other._context) {
}

Expand Down Expand Up @@ -9761,7 +9761,7 @@ namespace fakeit {
_isVerified(false) {
}

VerifyNoOtherInvocationsExpectation(VerifyNoOtherInvocationsExpectation &other) = default;
VerifyNoOtherInvocationsExpectation(const VerifyNoOtherInvocationsExpectation &other) = default;

void VerifyExpectation(VerificationEventHandler &verificationErrorHandler) {
if (_isVerified)
Expand Down
16 changes: 8 additions & 8 deletions single_header/cute/fakeit.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*
* FakeIt - A Simplified C++ Mocking Framework
* Copyright (c) Eran Pe'er 2013
* Generated: 2022-12-02 14:52:43.698027
* Generated: 2022-12-16 13:26:49.412618
* Distributed under the MIT License. Please refer to the LICENSE file at:
* https://github.com/eranpeer/FakeIt
*/
Expand Down Expand Up @@ -8247,7 +8247,7 @@ namespace fakeit {
: _impl{new Implementation(stubbingContext)} {
}

MethodMockingContext(MethodMockingContext &) = default;
MethodMockingContext(const MethodMockingContext &) = default;



Expand Down Expand Up @@ -8351,7 +8351,7 @@ namespace fakeit {
: MethodMockingContext<R, arglist...>(stubbingContext) {
}

MockingContext(MockingContext &) = default;
MockingContext(const MockingContext &) = default;

MockingContext(MockingContext &&other)
: MethodMockingContext<R, arglist...>(std::move(other)) {
Expand Down Expand Up @@ -8411,7 +8411,7 @@ namespace fakeit {
: MethodMockingContext<void, arglist...>(stubbingContext) {
}

MockingContext(MockingContext &) = default;
MockingContext(const MockingContext &) = default;

MockingContext(MockingContext &&other)
: MethodMockingContext<void, arglist...>(std::move(other)) {
Expand Down Expand Up @@ -8456,7 +8456,7 @@ namespace fakeit {
: MethodMockingContext<void>(stubbingContext) {
}

DtorMockingContext(DtorMockingContext &other) : MethodMockingContext<void>(other) {
DtorMockingContext(const DtorMockingContext &other) : MethodMockingContext<void>(other) {
}

DtorMockingContext(DtorMockingContext &&other) : MethodMockingContext<void>(std::move(other)) {
Expand Down Expand Up @@ -9039,7 +9039,7 @@ namespace fakeit {
_xaction.commit();
}

StubbingChange(StubbingChange &other) :
StubbingChange(const StubbingChange &other) :
_xaction(other._xaction) {
}

Expand All @@ -9061,7 +9061,7 @@ namespace fakeit {

virtual ~MethodProgress() override = default;

MethodProgress(MethodProgress &other) :
MethodProgress(const MethodProgress &other) :
_progress(other._progress), _context(other._context) {
}

Expand Down Expand Up @@ -9702,7 +9702,7 @@ namespace fakeit {
_isVerified(false) {
}

VerifyNoOtherInvocationsExpectation(VerifyNoOtherInvocationsExpectation &other) = default;
VerifyNoOtherInvocationsExpectation(const VerifyNoOtherInvocationsExpectation &other) = default;

void VerifyExpectation(VerificationEventHandler &verificationErrorHandler) {
if (_isVerified)
Expand Down
16 changes: 8 additions & 8 deletions single_header/doctest/fakeit.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*
* FakeIt - A Simplified C++ Mocking Framework
* Copyright (c) Eran Pe'er 2013
* Generated: 2022-12-02 14:52:43.925995
* Generated: 2022-12-16 13:26:49.738659
* Distributed under the MIT License. Please refer to the LICENSE file at:
* https://github.com/eranpeer/FakeIt
*/
Expand Down Expand Up @@ -8275,7 +8275,7 @@ namespace fakeit {
: _impl{new Implementation(stubbingContext)} {
}

MethodMockingContext(MethodMockingContext &) = default;
MethodMockingContext(const MethodMockingContext &) = default;



Expand Down Expand Up @@ -8379,7 +8379,7 @@ namespace fakeit {
: MethodMockingContext<R, arglist...>(stubbingContext) {
}

MockingContext(MockingContext &) = default;
MockingContext(const MockingContext &) = default;

MockingContext(MockingContext &&other)
: MethodMockingContext<R, arglist...>(std::move(other)) {
Expand Down Expand Up @@ -8439,7 +8439,7 @@ namespace fakeit {
: MethodMockingContext<void, arglist...>(stubbingContext) {
}

MockingContext(MockingContext &) = default;
MockingContext(const MockingContext &) = default;

MockingContext(MockingContext &&other)
: MethodMockingContext<void, arglist...>(std::move(other)) {
Expand Down Expand Up @@ -8484,7 +8484,7 @@ namespace fakeit {
: MethodMockingContext<void>(stubbingContext) {
}

DtorMockingContext(DtorMockingContext &other) : MethodMockingContext<void>(other) {
DtorMockingContext(const DtorMockingContext &other) : MethodMockingContext<void>(other) {
}

DtorMockingContext(DtorMockingContext &&other) : MethodMockingContext<void>(std::move(other)) {
Expand Down Expand Up @@ -9067,7 +9067,7 @@ namespace fakeit {
_xaction.commit();
}

StubbingChange(StubbingChange &other) :
StubbingChange(const StubbingChange &other) :
_xaction(other._xaction) {
}

Expand All @@ -9089,7 +9089,7 @@ namespace fakeit {

virtual ~MethodProgress() override = default;

MethodProgress(MethodProgress &other) :
MethodProgress(const MethodProgress &other) :
_progress(other._progress), _context(other._context) {
}

Expand Down Expand Up @@ -9716,7 +9716,7 @@ namespace fakeit {
_isVerified(false) {
}

VerifyNoOtherInvocationsExpectation(VerifyNoOtherInvocationsExpectation &other) = default;
VerifyNoOtherInvocationsExpectation(const VerifyNoOtherInvocationsExpectation &other) = default;

void VerifyExpectation(VerificationEventHandler &verificationErrorHandler) {
if (_isVerified)
Expand Down
Loading

0 comments on commit 833e4ce

Please sign in to comment.