eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reverting, test

Browse Source
This commit is contained in:
Gennadiy Civil 2018-04-19 11:28:46 -04:00
parent 2b790c5f24
commit 8c56e0c06f
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
googlemock/test/gmock-matchers_test.cc
View File

@ -749,11 +749,6 @@ TEST(MatcherCastTest, NonImplicitlyConstructibleTypeWithOperatorEq) {
EXPECT_FALSE(m3.Matches(239)); EXPECT_FALSE(m3.Matches(239));
} }
// ConvertibleFromAny does not work with MSVC. resulting in
// error C2440: 'initializing': cannot convert from 'Eq' to 'M'
// No constructor could take the source type, or constructor overload
// resolution was ambiguous
// The below ConvertibleFromAny struct is implicitly constructible from anything // The below ConvertibleFromAny struct is implicitly constructible from anything
// and when in the same namespace can interact with other tests. In particular, // and when in the same namespace can interact with other tests. In particular,
// if it is in the same namespace as other tests and one removes // if it is in the same namespace as other tests and one removes
@ -764,9 +759,9 @@ TEST(MatcherCastTest, NonImplicitlyConstructibleTypeWithOperatorEq) {
namespace convertible_from_any { namespace convertible_from_any {
// Implicitly convertible from any type. // Implicitly convertible from any type.
struct ConvertibleFromAny { struct ConvertibleFromAny {
explicit ConvertibleFromAny(int a_value) : value(a_value) {} ConvertibleFromAny(int a_value) : value(a_value) {}
template <typename T> template <typename T>
ConvertibleFromAny(const T& /*a_value*/) : value(-1) { explicit ConvertibleFromAny(const T& /*a_value*/) : value(-1) {
ADD_FAILURE() << "Conversion constructor called"; ADD_FAILURE() << "Conversion constructor called";
} }
int value; int value;
@ -794,7 +789,6 @@ TEST(MatcherCastTest, FromConvertibleFromAny) {
} }
} // namespace convertible_from_any } // namespace convertible_from_any
struct IntReferenceWrapper { struct IntReferenceWrapper {
IntReferenceWrapper(const int& a_value) : value(&a_value) {} IntReferenceWrapper(const int& a_value) : value(&a_value) {}
const int* value; const int* value;
@ -899,8 +893,6 @@ TEST(SafeMatcherCastTest, FromSameType) {
EXPECT_FALSE(m2.Matches(1)); EXPECT_FALSE(m2.Matches(1));
} }
#if !defined _MSC_VER
namespace convertible_from_any { namespace convertible_from_any {
TEST(SafeMatcherCastTest, ConversionConstructorIsUsed) { TEST(SafeMatcherCastTest, ConversionConstructorIsUsed) {
Matcher<ConvertibleFromAny> m = SafeMatcherCast<ConvertibleFromAny>(1); Matcher<ConvertibleFromAny> m = SafeMatcherCast<ConvertibleFromAny>(1);
@ -916,8 +908,6 @@ TEST(SafeMatcherCastTest, FromConvertibleFromAny) {
} }
} // namespace convertible_from_any } // namespace convertible_from_any
#endif // !defined _MSC_VER
TEST(SafeMatcherCastTest, ValueIsNotCopied) { TEST(SafeMatcherCastTest, ValueIsNotCopied) {
int n = 42; int n = 42;
Matcher<IntReferenceWrapper> m = SafeMatcherCast<IntReferenceWrapper>(n); Matcher<IntReferenceWrapper> m = SafeMatcherCast<IntReferenceWrapper>(n);
@ -6733,7 +6723,7 @@ TEST(NotTest, WorksOnMoveOnlyType) {
} // namespace gmock_matchers_test } // namespace gmock_matchers_test
} // namespace testing } // namespace testing
#if defined _MSC_VER #if defined_MSC_VER
# pragma warning(pop) # pragma warning(pop)
#endif #endif