Skip to content

GitLab

Unverified Commit d0905653 authored by Gennadiy Civil's avatar Gennadiy Civil Committed by GitHub
Browse files

Merge pull request #1547 from gennadiycivil/master 

Matchers testing
parents 2cf2a1f8 7e5f90d3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 788 additions and 37 deletions
googlemock/include/gmock/gmock-more-matchers.h
View file @ d0905653
...@@ -43,6 +43,15 @@ ...@@ -43,6 +43,15 @@
namespace testing { namespace testing {
// Silence C4100 (unreferenced formal
// parameter) for MSVC
#ifdef _MSC_VER
# pragma warning(disable:4100)
#if (_MSC_VER == 1900)
# pragma warning(disable:4800)
#endif
#endif
// Defines a matcher that matches an empty container. The container must // Defines a matcher that matches an empty container. The container must
// support both size() and empty(), which all STL-like containers provide. // support both size() and empty(), which all STL-like containers provide.
MATCHER(IsEmpty, negation ? "isn't empty" : "is empty") { MATCHER(IsEmpty, negation ? "isn't empty" : "is empty") {
......
googlemock/test/gmock-matchers_test.cc
View file @ d0905653
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment