gmock.h (googletest-release-1.10.0) | : | gmock.h (googletest-release-1.11.0) | ||
---|---|---|---|---|
skipping to change at line 36 | skipping to change at line 36 | |||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | |||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||
// Google Mock - a framework for writing C++ mock classes. | // Google Mock - a framework for writing C++ mock classes. | |||
// | // | |||
// This is the main header file a user should include. | // This is the main header file a user should include. | |||
// GOOGLETEST_CM0002 DO NOT DELETE | // GOOGLETEST_CM0002 DO NOT DELETE | |||
#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_H_ | #ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_H_ | |||
#define GMOCK_INCLUDE_GMOCK_GMOCK_H_ | #define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_H_ | |||
// This file implements the following syntax: | // This file implements the following syntax: | |||
// | // | |||
// ON_CALL(mock_object, Method(...)) | // ON_CALL(mock_object, Method(...)) | |||
// .With(...) ? | // .With(...) ? | |||
// .WillByDefault(...); | // .WillByDefault(...); | |||
// | // | |||
// where With() is optional and WillByDefault() must appear exactly | // where With() is optional and WillByDefault() must appear exactly | |||
// once. | // once. | |||
// | // | |||
skipping to change at line 61 | skipping to change at line 61 | |||
// .InSequence(...) * | // .InSequence(...) * | |||
// .WillOnce(...) * | // .WillOnce(...) * | |||
// .WillRepeatedly(...) ? | // .WillRepeatedly(...) ? | |||
// .RetiresOnSaturation() ? ; | // .RetiresOnSaturation() ? ; | |||
// | // | |||
// where all clauses are optional and WillOnce() can be repeated. | // where all clauses are optional and WillOnce() can be repeated. | |||
#include "gmock/gmock-actions.h" | #include "gmock/gmock-actions.h" | |||
#include "gmock/gmock-cardinalities.h" | #include "gmock/gmock-cardinalities.h" | |||
#include "gmock/gmock-function-mocker.h" | #include "gmock/gmock-function-mocker.h" | |||
#include "gmock/gmock-generated-actions.h" | ||||
#include "gmock/gmock-generated-function-mockers.h" | ||||
#include "gmock/gmock-generated-matchers.h" | ||||
#include "gmock/gmock-matchers.h" | #include "gmock/gmock-matchers.h" | |||
#include "gmock/gmock-more-actions.h" | #include "gmock/gmock-more-actions.h" | |||
#include "gmock/gmock-more-matchers.h" | #include "gmock/gmock-more-matchers.h" | |||
#include "gmock/gmock-nice-strict.h" | #include "gmock/gmock-nice-strict.h" | |||
#include "gmock/internal/gmock-internal-utils.h" | #include "gmock/internal/gmock-internal-utils.h" | |||
namespace testing { | namespace testing { | |||
// Declares Google Mock flags that we want a user to use programmatically. | // Declares Google Mock flags that we want a user to use programmatically. | |||
GMOCK_DECLARE_bool_(catch_leaked_mocks); | GMOCK_DECLARE_bool_(catch_leaked_mocks); | |||
skipping to change at line 100 | skipping to change at line 97 | |||
// This overloaded version can be used in Windows programs compiled in | // This overloaded version can be used in Windows programs compiled in | |||
// UNICODE mode. | // UNICODE mode. | |||
GTEST_API_ void InitGoogleMock(int* argc, wchar_t** argv); | GTEST_API_ void InitGoogleMock(int* argc, wchar_t** argv); | |||
// This overloaded version can be used on Arduino/embedded platforms where | // This overloaded version can be used on Arduino/embedded platforms where | |||
// there is no argc/argv. | // there is no argc/argv. | |||
GTEST_API_ void InitGoogleMock(); | GTEST_API_ void InitGoogleMock(); | |||
} // namespace testing | } // namespace testing | |||
#endif // GMOCK_INCLUDE_GMOCK_GMOCK_H_ | #endif // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_H_ | |||
End of changes. 3 change blocks. | ||||
5 lines changed or deleted | 2 lines changed or added |