Fixes a slew of compiler warnings and turns on "warning as error" in the scons build.
diff --git a/test/gmock-actions_test.cc b/test/gmock-actions_test.cc
index ea3c310..a2c6fe1 100644
--- a/test/gmock-actions_test.cc
+++ b/test/gmock-actions_test.cc
@@ -95,26 +95,26 @@
// Tests that BuiltInDefaultValue<T>::Get() returns 0 when T is a
// built-in numeric type.
TEST(BuiltInDefaultValueTest, IsZeroForNumericTypes) {
- EXPECT_EQ(0, BuiltInDefaultValue<unsigned char>::Get());
+ EXPECT_EQ(0U, BuiltInDefaultValue<unsigned char>::Get());
EXPECT_EQ(0, BuiltInDefaultValue<signed char>::Get());
EXPECT_EQ(0, BuiltInDefaultValue<char>::Get());
#if GMOCK_HAS_SIGNED_WCHAR_T_
- EXPECT_EQ(0, BuiltInDefaultValue<unsigned wchar_t>::Get());
+ EXPECT_EQ(0U, BuiltInDefaultValue<unsigned wchar_t>::Get());
EXPECT_EQ(0, BuiltInDefaultValue<signed wchar_t>::Get());
#endif
#if GMOCK_WCHAR_T_IS_NATIVE_
EXPECT_EQ(0, BuiltInDefaultValue<wchar_t>::Get());
#endif
- EXPECT_EQ(0, BuiltInDefaultValue<unsigned short>::Get()); // NOLINT
+ EXPECT_EQ(0U, BuiltInDefaultValue<unsigned short>::Get()); // NOLINT
EXPECT_EQ(0, BuiltInDefaultValue<signed short>::Get()); // NOLINT
EXPECT_EQ(0, BuiltInDefaultValue<short>::Get()); // NOLINT
- EXPECT_EQ(0, BuiltInDefaultValue<unsigned int>::Get());
+ EXPECT_EQ(0U, BuiltInDefaultValue<unsigned int>::Get());
EXPECT_EQ(0, BuiltInDefaultValue<signed int>::Get());
EXPECT_EQ(0, BuiltInDefaultValue<int>::Get());
- EXPECT_EQ(0, BuiltInDefaultValue<unsigned long>::Get()); // NOLINT
+ EXPECT_EQ(0U, BuiltInDefaultValue<unsigned long>::Get()); // NOLINT
EXPECT_EQ(0, BuiltInDefaultValue<signed long>::Get()); // NOLINT
EXPECT_EQ(0, BuiltInDefaultValue<long>::Get()); // NOLINT
- EXPECT_EQ(0, BuiltInDefaultValue<UInt64>::Get());
+ EXPECT_EQ(0U, BuiltInDefaultValue<UInt64>::Get());
EXPECT_EQ(0, BuiltInDefaultValue<Int64>::Get());
EXPECT_EQ(0, BuiltInDefaultValue<float>::Get());
EXPECT_EQ(0, BuiltInDefaultValue<double>::Get());
@@ -517,11 +517,13 @@
// gmock-actions.h for more information.
class FromType {
public:
- FromType(bool* converted) : converted_(converted) {}
+ FromType(bool* is_converted) : converted_(is_converted) {}
bool* converted() const { return converted_; }
private:
bool* const converted_;
+
+ GTEST_DISALLOW_ASSIGN_(FromType);
};
class ToType {
@@ -588,8 +590,13 @@
class MockClass {
public:
+ MockClass() {}
+
MOCK_METHOD1(IntFunc, int(bool flag)); // NOLINT
MOCK_METHOD0(Foo, MyClass());
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(MockClass);
};
// Tests that DoDefault() returns the built-in default value for the
@@ -615,7 +622,7 @@
// Tests that using DoDefault() inside a composite action leads to a
// run-time error.
-void VoidFunc(bool flag) {}
+void VoidFunc(bool /* flag */) {}
TEST(DoDefaultDeathTest, DiesIfUsedInCompositeAction) {
MockClass mock;
@@ -801,7 +808,7 @@
const char* Plus1(const char* s) { return s + 1; }
-void VoidUnary(int n) { g_done = true; }
+void VoidUnary(int /* n */) { g_done = true; }
bool ByConstRef(const std::string& s) { return s == "Hi"; }
@@ -870,7 +877,7 @@
EXPECT_EQ(1, a.Perform(make_tuple(2)));
// As an action that takes two arguments.
- Action<short(int, double)> a2 = InvokeWithoutArgs(Nullary); // NOLINT
+ Action<int(int, double)> a2 = InvokeWithoutArgs(Nullary); // NOLINT
EXPECT_EQ(1, a2.Perform(make_tuple(2, 3.5)));
// As an action that returns void.
@@ -887,7 +894,7 @@
EXPECT_EQ(2, a.Perform(make_tuple()));
// As an action that takes three arguments.
- Action<short(int, double, char)> a2 = // NOLINT
+ Action<int(int, double, char)> a2 = // NOLINT
InvokeWithoutArgs(NullaryFunctor());
EXPECT_EQ(2, a2.Perform(make_tuple(3, 3.5, 'a')));
@@ -928,7 +935,7 @@
// Tests using IgnoreResult() on an action that returns a class type.
-MyClass ReturnMyClass(double x) {
+MyClass ReturnMyClass(double /* x */) {
g_done = true;
return MyClass();
}
diff --git a/test/gmock-cardinalities_test.cc b/test/gmock-cardinalities_test.cc
index f3f1e10..f6a9491 100644
--- a/test/gmock-cardinalities_test.cc
+++ b/test/gmock-cardinalities_test.cc
@@ -52,7 +52,11 @@
class MockFoo {
public:
+ MockFoo() {}
MOCK_METHOD0(Bar, int()); // NOLINT
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFoo);
};
// Tests that Cardinality objects can be default constructed.
@@ -398,7 +402,9 @@
}
// Returns true iff call_count calls will saturate this cardinality.
- virtual bool IsSaturatedByCallCount(int call_count) const { return false; }
+ virtual bool IsSaturatedByCallCount(int /* call_count */) const {
+ return false;
+ }
// Describes self to an ostream.
virtual void DescribeTo(::std::ostream* ss) const {
diff --git a/test/gmock-generated-actions_test.cc b/test/gmock-generated-actions_test.cc
index 2e6fa0b..3c076d7 100644
--- a/test/gmock-generated-actions_test.cc
+++ b/test/gmock-generated-actions_test.cc
@@ -63,6 +63,10 @@
using testing::Unused;
using testing::WithArgs;
+// For suppressing compiler warnings on conversion possibly losing precision.
+inline short Short(short n) { return n; } // NOLINT
+inline char Char(char ch) { return ch; }
+
// Sample functions and functors for testing various actions.
int Nullary() { return 1; }
@@ -242,7 +246,7 @@
// Tests using InvokeArgument with a function that takes a pointer argument.
TEST(InvokeArgumentTest, ByPointerFunction) {
Action<const char*(const char*(*)(const char* input, short n))> a = // NOLINT
- InvokeArgument<0>(static_cast<const char*>("Hi"), 1);
+ InvokeArgument<0>(static_cast<const char*>("Hi"), Short(1));
EXPECT_STREQ("i", a.Perform(make_tuple(&Binary)));
}
@@ -250,7 +254,7 @@
// by passing it a C-string literal.
TEST(InvokeArgumentTest, FunctionWithCStringLiteral) {
Action<const char*(const char*(*)(const char* input, short n))> a = // NOLINT
- InvokeArgument<0>("Hi", 1);
+ InvokeArgument<0>("Hi", Short(1));
EXPECT_STREQ("i", a.Perform(make_tuple(&Binary)));
}
@@ -286,17 +290,17 @@
// Tests using WithArgs with an action that takes 2 arguments.
TEST(WithArgsTest, TwoArgs) {
- Action<const char*(const char* s, double x, int n)> a =
+ Action<const char*(const char* s, double x, short n)> a =
WithArgs<0, 2>(Invoke(Binary));
const char s[] = "Hello";
- EXPECT_EQ(s + 2, a.Perform(make_tuple(CharPtr(s), 0.5, 2)));
+ EXPECT_EQ(s + 2, a.Perform(make_tuple(CharPtr(s), 0.5, Short(2))));
}
// Tests using WithArgs with an action that takes 3 arguments.
TEST(WithArgsTest, ThreeArgs) {
Action<int(int, double, char, short)> a = // NOLINT
WithArgs<0, 2, 3>(Invoke(Ternary));
- EXPECT_EQ(123, a.Perform(make_tuple(100, 6.5, 20, 3)));
+ EXPECT_EQ(123, a.Perform(make_tuple(100, 6.5, Char(20), Short(3))));
}
// Tests using WithArgs with an action that takes 4 arguments.
@@ -379,7 +383,7 @@
TEST(WithArgsTest, Identity) {
Action<int(int x, char y, short z)> a = // NOLINT
WithArgs<0, 1, 2>(Invoke(Ternary));
- EXPECT_EQ(123, a.Perform(make_tuple(100, 20, 3)));
+ EXPECT_EQ(123, a.Perform(make_tuple(100, Char(20), Short(3))));
}
// Tests using WithArgs with repeated arguments.
@@ -394,14 +398,14 @@
Action<const char*(short n, const char* input)> a = // NOLINT
WithArgs<1, 0>(Invoke(Binary));
const char s[] = "Hello";
- EXPECT_EQ(s + 2, a.Perform(make_tuple(2, CharPtr(s))));
+ EXPECT_EQ(s + 2, a.Perform(make_tuple(Short(2), CharPtr(s))));
}
// Tests using WithArgs with compatible, but not identical, argument types.
TEST(WithArgsTest, ArgsOfCompatibleTypes) {
- Action<long(short x, int y, double z, char c)> a = // NOLINT
+ Action<long(short x, char y, double z, char c)> a = // NOLINT
WithArgs<0, 1, 3>(Invoke(Ternary));
- EXPECT_EQ(123, a.Perform(make_tuple(100, 20, 5.6, 3)));
+ EXPECT_EQ(123, a.Perform(make_tuple(Short(100), Char(20), 5.6, Char(3))));
}
// Tests using WithArgs with an action that returns void.
@@ -583,6 +587,16 @@
EXPECT_EQ('g', g);
}
+// The ACTION*() macros trigger warning C4100 (unreferenced formal
+// parameter) in MSVC with -W4. Unfortunately they cannot be fixed in
+// the macro definition, as the warnings are generated when the macro
+// is expanded and macro expansion cannot contain #pragma. Therefore
+// we suppress them here.
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4100)
+#endif
+
// Tests the ACTION*() macro family.
// Tests that ACTION() can define an action that doesn't reference the
@@ -633,7 +647,7 @@
TEST(ActionMacroTest, CanReferenceArgumentTuple) {
Action<int(int, char, int*)> a1 = Sum2();
int dummy = 0;
- EXPECT_EQ(11, a1.Perform(make_tuple(5, static_cast<char>(6), &dummy)));
+ EXPECT_EQ(11, a1.Perform(make_tuple(5, Char(6), &dummy)));
}
// Tests that the body of ACTION() can reference the mock function
@@ -731,7 +745,7 @@
TEST(ActionPMacroTest, CanReferenceArgumentAndParameterTypes) {
Action<int(char m, bool t)> a1 = TypedPlus(9);
- EXPECT_EQ(10, a1.Perform(make_tuple(static_cast<char>(1), true)));
+ EXPECT_EQ(10, a1.Perform(make_tuple(Char(1), true)));
}
// Tests that a parameterized action can be used in any mock function
@@ -851,7 +865,7 @@
ACTION_P2(PadArgument, prefix, suffix) {
// The following lines promote the two parameters to desired types.
std::string prefix_str(prefix);
- char suffix_char(suffix);
+ char suffix_char = static_cast<char>(suffix);
return prefix_str + arg0 + suffix_char;
}
@@ -1078,7 +1092,7 @@
explicit BoolResetter(bool* value) : value_(value) {}
~BoolResetter() { *value_ = false; }
private:
- bool* const value_;
+ bool* value_;
};
TEST(ActionTemplateTest, WorksForIntegralTemplateParams) {
@@ -1190,5 +1204,9 @@
EXPECT_EQ(12345, a4.Perform(make_tuple()));
}
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
} // namespace gmock_generated_actions_test
} // namespace testing
diff --git a/test/gmock-generated-function-mockers_test.cc b/test/gmock-generated-function-mockers_test.cc
index 1ce8c45..5d839c4 100644
--- a/test/gmock-generated-function-mockers_test.cc
+++ b/test/gmock-generated-function-mockers_test.cc
@@ -114,6 +114,8 @@
class MockFoo : public FooInterface {
public:
+ MockFoo() {}
+
// Makes sure that a mock function parameter can be named.
MOCK_METHOD1(VoidReturning, void(int n)); // NOLINT
@@ -149,6 +151,9 @@
const string& k));
MOCK_CONST_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, CTConst, char(int));
#endif // GTEST_OS_WINDOWS
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFoo);
};
class FunctionMockerTest : public testing::Test {
@@ -305,7 +310,12 @@
class MockB {
public:
+ MockB() {}
+
MOCK_METHOD0(DoB, void());
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(MockB);
};
// Tests that functions with no EXPECT_CALL() ruls can be called any
@@ -345,10 +355,15 @@
template <typename T>
class MockStack : public StackInterface<T> {
public:
+ MockStack() {}
+
MOCK_METHOD1_T(Push, void(const T& elem));
MOCK_METHOD0_T(Pop, void());
MOCK_CONST_METHOD0_T(GetSize, int()); // NOLINT
MOCK_CONST_METHOD0_T(GetTop, const T&());
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(MockStack);
};
// Tests that template mock works.
@@ -393,10 +408,15 @@
template <typename T>
class MockStackWithCallType : public StackInterfaceWithCallType<T> {
public:
+ MockStackWithCallType() {}
+
MOCK_METHOD1_T_WITH_CALLTYPE(STDMETHODCALLTYPE, Push, void(const T& elem));
MOCK_METHOD0_T_WITH_CALLTYPE(STDMETHODCALLTYPE, Pop, void());
MOCK_CONST_METHOD0_T_WITH_CALLTYPE(STDMETHODCALLTYPE, GetSize, int());
MOCK_CONST_METHOD0_T_WITH_CALLTYPE(STDMETHODCALLTYPE, GetTop, const T&());
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(MockStackWithCallType);
};
// Tests that template mock with calltype works.
@@ -430,7 +450,12 @@
class MockOverloadedOnArgNumber {
public:
+ MockOverloadedOnArgNumber() {}
+
MY_MOCK_METHODS1_;
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(MockOverloadedOnArgNumber);
};
TEST(OverloadedMockMethodTest, CanOverloadOnArgNumberInMacroBody) {
@@ -450,7 +475,12 @@
class MockOverloadedOnConstness {
public:
+ MockOverloadedOnConstness() {}
+
MY_MOCK_METHODS2_;
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(MockOverloadedOnConstness);
};
TEST(OverloadedMockMethodTest, CanOverloadOnConstnessInMacroBody) {
diff --git a/test/gmock-generated-matchers_test.cc b/test/gmock-generated-matchers_test.cc
index 19024d0..4141305 100644
--- a/test/gmock-generated-matchers_test.cc
+++ b/test/gmock-generated-matchers_test.cc
@@ -223,8 +223,9 @@
*os << "is " << -diff << " less than " << rhs_;
}
}
+
private:
- const int rhs_;
+ int rhs_;
};
Matcher<int> GreaterThan(int n) {
@@ -411,7 +412,7 @@
};
vector<list<char> > nested;
- for (int i = 0; i < GMOCK_ARRAY_SIZE_(strings); i++) {
+ for (size_t i = 0; i < GMOCK_ARRAY_SIZE_(strings); i++) {
nested.push_back(list<char>(strings[i], strings[i] + strlen(strings[i])));
}
@@ -446,7 +447,12 @@
class NativeArrayPassedAsPointerAndSize {
public:
+ NativeArrayPassedAsPointerAndSize() {}
+
MOCK_METHOD2(Helper, void(int* array, int size));
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(NativeArrayPassedAsPointerAndSize);
};
TEST(ElementsAreTest, WorksWithNativeArrayPassedAsPointerAndSize) {
@@ -550,7 +556,10 @@
// Tests that the description string supplied to MATCHER() must be
// valid.
-MATCHER(HasBadDescription, "Invalid%") { return true; }
+MATCHER(HasBadDescription, "Invalid%") {
+ // Uses arg to suppress "unused parameter" warning.
+ return arg==arg;
+}
TEST(MatcherMacroTest,
CreatingMatcherWithBadDescriptionGeneratesNonfatalFailure) {
@@ -560,7 +569,7 @@
"use \"%%\" instead of \"%\" to print \"%\".");
}
-MATCHER(HasGoodDescription, "good") { return true; }
+MATCHER(HasGoodDescription, "good") { return arg==arg; }
TEST(MatcherMacroTest, AcceptsValidDescription) {
const Matcher<int> m = HasGoodDescription();
@@ -642,7 +651,7 @@
}
-MATCHER_P(HasGoodDescription1, n, "good %(n)s") { return true; }
+MATCHER_P(HasGoodDescription1, n, "good %(n)s") { return arg==arg; }
TEST(MatcherPMacroTest, AcceptsValidDescription) {
const Matcher<int> m = HasGoodDescription1(5);
@@ -709,7 +718,7 @@
MATCHER_P2(HasComplexDescription, foo, bar,
"is as complex as %(foo)s %(bar)s (i.e. %(*)s or %%%(foo)s!)") {
- return true;
+ return arg==arg;
}
TEST(MatcherPnMacroTest, AcceptsValidDescription) {
@@ -861,7 +870,7 @@
MATCHER_P2(EqConcat, prefix, suffix, "") {
// The following lines promote the two parameters to desired types.
std::string prefix_str(prefix);
- char suffix_char(suffix);
+ char suffix_char = static_cast<char>(suffix);
return arg == prefix_str + suffix_char;
}
diff --git a/test/gmock-internal-utils_test.cc b/test/gmock-internal-utils_test.cc
index ac3b2dd..7dd8311 100644
--- a/test/gmock-internal-utils_test.cc
+++ b/test/gmock-internal-utils_test.cc
@@ -819,7 +819,7 @@
TEST(NativeArrayTest, ConstructorFromArrayWorks) {
const int a[3] = { 0, 1, 2 };
NativeArray<int> na(a, 3, kReference);
- EXPECT_EQ(3, na.size());
+ EXPECT_EQ(3U, na.size());
EXPECT_EQ(a, na.begin());
}
@@ -849,7 +849,7 @@
TEST(NativeArrayTest, MethodsWork) {
const int a[3] = { 0, 1, 2 };
NativeArray<int> na(a, 3, kCopy);
- ASSERT_EQ(3, na.size());
+ ASSERT_EQ(3U, na.size());
EXPECT_EQ(3, na.end() - na.begin());
NativeArray<int>::const_iterator it = na.begin();
@@ -875,7 +875,7 @@
TEST(NativeArrayTest, WorksForTwoDimensionalArray) {
const char a[2][3] = { "hi", "lo" };
NativeArray<char[3]> na(a, 2, kReference);
- ASSERT_EQ(2, na.size());
+ ASSERT_EQ(2U, na.size());
EXPECT_EQ(a, na.begin());
}
@@ -910,11 +910,11 @@
int a1[3] = { 0, 1, 2 };
NativeArray<int> a2 = StlContainerView<int[3]>::ConstReference(a1);
- EXPECT_EQ(3, a2.size());
+ EXPECT_EQ(3U, a2.size());
EXPECT_EQ(a1, a2.begin());
const NativeArray<int> a3 = StlContainerView<int[3]>::Copy(a1);
- ASSERT_EQ(3, a3.size());
+ ASSERT_EQ(3U, a3.size());
EXPECT_EQ(0, a3.begin()[0]);
EXPECT_EQ(1, a3.begin()[1]);
EXPECT_EQ(2, a3.begin()[2]);
@@ -937,12 +937,12 @@
const int* const p1 = a1;
NativeArray<int> a2 = StlContainerView<tuple<const int*, int> >::
ConstReference(make_tuple(p1, 3));
- EXPECT_EQ(3, a2.size());
+ EXPECT_EQ(3U, a2.size());
EXPECT_EQ(a1, a2.begin());
const NativeArray<int> a3 = StlContainerView<tuple<int*, size_t> >::
Copy(make_tuple(static_cast<int*>(a1), 3));
- ASSERT_EQ(3, a3.size());
+ ASSERT_EQ(3U, a3.size());
EXPECT_EQ(0, a3.begin()[0]);
EXPECT_EQ(1, a3.begin()[1]);
EXPECT_EQ(2, a3.begin()[2]);
diff --git a/test/gmock-matchers_test.cc b/test/gmock-matchers_test.cc
index 919ce65..907749d 100644
--- a/test/gmock-matchers_test.cc
+++ b/test/gmock-matchers_test.cc
@@ -152,8 +152,9 @@
*os << "is " << -diff << " less than " << rhs_;
}
}
+
private:
- const int rhs_;
+ int rhs_;
};
Matcher<int> GreaterThan(int n) {
@@ -335,7 +336,7 @@
public:
// An int can be statically (although not implicitly) cast to a
// IntValue.
- explicit IntValue(int value) : value_(value) {}
+ explicit IntValue(int a_value) : value_(a_value) {}
int value() const { return value_; }
private:
@@ -560,7 +561,7 @@
public:
Unprintable() : c_('a') {}
- bool operator==(const Unprintable& rhs) { return true; }
+ bool operator==(const Unprintable& /* rhs */) { return true; }
private:
char c_;
};
@@ -606,7 +607,7 @@
// "undefined referece".
template <typename T>
struct Type {
- static bool IsTypeOf(const T& v) { return true; }
+ static bool IsTypeOf(const T& /* v */) { return true; }
template <typename T2>
static void IsTypeOf(T2 v);
@@ -1861,8 +1862,9 @@
explicit IsGreaterThan(int threshold) : threshold_(threshold) {}
bool operator()(int n) const { return n > threshold_; }
+
private:
- const int threshold_;
+ int threshold_;
};
// For testing Truly().
@@ -1959,7 +1961,12 @@
class AllArgsHelper {
public:
+ AllArgsHelper() {}
+
MOCK_METHOD2(Helper, int(char x, int y));
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(AllArgsHelper);
};
TEST(AllArgsTest, WorksInWithClause) {
@@ -2384,7 +2391,7 @@
// An uncopyable class.
class Uncopyable {
public:
- explicit Uncopyable(int value) : value_(value) {}
+ explicit Uncopyable(int a_value) : value_(a_value) {}
int value() const { return value_; }
private:
@@ -2405,11 +2412,17 @@
const double y; // A const field.
Uncopyable z; // An uncopyable field.
const char* p; // A pointer field.
+
+ private:
+ GTEST_DISALLOW_ASSIGN_(AStruct);
};
// A derived struct for testing Field().
struct DerivedStruct : public AStruct {
char ch;
+
+ private:
+ GTEST_DISALLOW_ASSIGN_(DerivedStruct);
};
// Tests that Field(&Foo::field, ...) works when field is non-const.
@@ -2943,7 +2956,7 @@
class DivisibleByImpl {
public:
- explicit DivisibleByImpl(int divider) : divider_(divider) {}
+ explicit DivisibleByImpl(int a_divider) : divider_(a_divider) {}
template <typename T>
bool Matches(const T& n) const {
@@ -2958,7 +2971,7 @@
*os << "is not divisible by " << divider_;
}
- void set_divider(int divider) { divider_ = divider; }
+ void set_divider(int a_divider) { divider_ = a_divider; }
int divider() const { return divider_; }
private:
@@ -3021,7 +3034,7 @@
class NotCopyable {
public:
- explicit NotCopyable(int value) : value_(value) {}
+ explicit NotCopyable(int a_value) : value_(a_value) {}
int value() const { return value_; }
diff --git a/test/gmock-more-actions_test.cc b/test/gmock-more-actions_test.cc
index f5dab5b..b3b17d3 100644
--- a/test/gmock-more-actions_test.cc
+++ b/test/gmock-more-actions_test.cc
@@ -65,6 +65,10 @@
using testing::WithArg;
using testing::WithoutArgs;
+// For suppressing compiler warnings on conversion possibly losing precision.
+inline short Short(short n) { return n; } // NOLINT
+inline char Char(char ch) { return ch; }
+
// Sample functions and functors for testing Invoke() and etc.
int Nullary() { return 1; }
@@ -85,7 +89,7 @@
const char* Plus1(const char* s) { return s + 1; }
-void VoidUnary(int n) { g_done = true; }
+void VoidUnary(int /* n */) { g_done = true; }
bool ByConstRef(const string& s) { return s == "Hi"; }
@@ -239,13 +243,13 @@
TEST(InvokeTest, Binary) {
Action<const char*(const char*, short)> a = Invoke(Binary); // NOLINT
const char* p = "Hello";
- EXPECT_EQ(p + 2, a.Perform(make_tuple(p, 2)));
+ EXPECT_EQ(p + 2, a.Perform(make_tuple(p, Short(2))));
}
// Tests using Invoke() with a ternary function.
TEST(InvokeTest, Ternary) {
Action<int(int, char, short)> a = Invoke(Ternary); // NOLINT
- EXPECT_EQ(6, a.Perform(make_tuple(1, '\2', 3)));
+ EXPECT_EQ(6, a.Perform(make_tuple(1, '\2', Short(3))));
}
// Tests using Invoke() with a 4-argument function.
@@ -340,14 +344,14 @@
// Tests using Invoke() with a functor.
TEST(InvokeTest, Functor) {
- Action<int(short, char)> a = Invoke(plus<short>()); // NOLINT
- EXPECT_EQ(3, a.Perform(make_tuple(1, 2)));
+ Action<long(long, int)> a = Invoke(plus<long>()); // NOLINT
+ EXPECT_EQ(3L, a.Perform(make_tuple(1, 2)));
}
// Tests using Invoke(f) as an action of a compatible type.
TEST(InvokeTest, FunctionWithCompatibleType) {
Action<long(int, short, char, bool)> a = Invoke(SumOf4); // NOLINT
- EXPECT_EQ(4321, a.Perform(make_tuple(4000, 300, 20, true)));
+ EXPECT_EQ(4321, a.Perform(make_tuple(4000, Short(300), Char(20), true)));
}
// Tests using Invoke() with an object pointer and a method pointer.
@@ -378,7 +382,7 @@
TEST(InvokeMethodTest, Ternary) {
Foo foo;
Action<int(int, bool, char)> a = Invoke(&foo, &Foo::Ternary); // NOLINT
- EXPECT_EQ(1124, a.Perform(make_tuple(1000, true, 1)));
+ EXPECT_EQ(1124, a.Perform(make_tuple(1000, true, Char(1))));
}
// Tests using Invoke() with a 4-argument method.
@@ -457,7 +461,7 @@
Foo foo;
Action<long(int, short, char, bool)> a = // NOLINT
Invoke(&foo, &Foo::SumOf4);
- EXPECT_EQ(4444, a.Perform(make_tuple(4000, 300, 20, true)));
+ EXPECT_EQ(4444, a.Perform(make_tuple(4000, Short(300), Char(20), true)));
}
// Tests using WithoutArgs with an action that takes no argument.
diff --git a/test/gmock-nice-strict_test.cc b/test/gmock-nice-strict_test.cc
index faf0145..1d36e03 100644
--- a/test/gmock-nice-strict_test.cc
+++ b/test/gmock-nice-strict_test.cc
@@ -40,7 +40,12 @@
// clash with ::testing::Mock.
class Mock {
public:
+ Mock() {}
+
MOCK_METHOD0(DoThis, void());
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(Mock);
};
namespace testing {
@@ -64,10 +69,14 @@
class MockFoo : public Foo {
public:
+ MockFoo() {}
void Delete() { delete this; }
MOCK_METHOD0(DoThis, void());
MOCK_METHOD1(DoThat, int(bool flag));
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFoo);
};
class MockBar {
@@ -89,6 +98,8 @@
private:
string str_;
+
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(MockBar);
};
// TODO(wan@google.com): find a way to re-enable these tests.
diff --git a/test/gmock-port_test.cc b/test/gmock-port_test.cc
index b2afb93..054313b 100644
--- a/test/gmock-port_test.cc
+++ b/test/gmock-port_test.cc
@@ -85,7 +85,7 @@
}
private:
- bool* const converted_;
+ bool* converted_;
};
TEST(ImplicitCastTest, CanUseNonConstCastOperator) {
@@ -104,7 +104,7 @@
}
private:
- bool* const converted_;
+ bool* converted_;
};
TEST(ImplicitCastTest, CanUseConstCastOperatorOnConstValues) {
@@ -128,8 +128,8 @@
}
private:
- bool* const converted_;
- bool* const const_converted_;
+ bool* converted_;
+ bool* const_converted_;
};
TEST(ImplicitCastTest, CanSelectBetweenConstAndNonConstCasrAppropriately) {
diff --git a/test/gmock-printers_test.cc b/test/gmock-printers_test.cc
index abfa923..0553e9c 100644
--- a/test/gmock-printers_test.cc
+++ b/test/gmock-printers_test.cc
@@ -77,7 +77,7 @@
virtual ~StreamableInGlobal() {}
};
-inline void operator<<(::std::ostream& os, const StreamableInGlobal& x) {
+inline void operator<<(::std::ostream& os, const StreamableInGlobal& /* x */) {
os << "StreamableInGlobal";
}
@@ -107,7 +107,7 @@
template <typename T>
class PrintableViaPrintToTemplate {
public:
- explicit PrintableViaPrintToTemplate(const T& value) : value_(value) {}
+ explicit PrintableViaPrintToTemplate(const T& a_value) : value_(a_value) {}
const T& value() const { return value_; }
private:
@@ -440,7 +440,7 @@
// Tests printing (non-member) function pointers.
-void MyFunction(int n) {}
+void MyFunction(int /* n */) {}
TEST(PrintPointerTest, NonMemberFunctionPointer) {
// We cannot directly cast &MyFunction to const void* because the
@@ -464,7 +464,7 @@
public:
virtual ~Foo() {}
int MyMethod(char x) { return x + 1; }
- virtual char MyVirtualMethod(int n) { return 'a'; }
+ virtual char MyVirtualMethod(int /* n */) { return 'a'; }
int value;
};
@@ -603,7 +603,7 @@
template <typename Char, typename CharTraits>
std::basic_ostream<Char, CharTraits>& operator<<(
std::basic_ostream<Char, CharTraits>& os,
- const AllowsGenericStreaming& a) {
+ const AllowsGenericStreaming& /* a */) {
return os << "AllowsGenericStreaming";
}
@@ -620,7 +620,7 @@
template <typename Char, typename CharTraits, typename T>
std::basic_ostream<Char, CharTraits>& operator<<(
std::basic_ostream<Char, CharTraits>& os,
- const AllowsGenericStreamingTemplate<T>& a) {
+ const AllowsGenericStreamingTemplate<T>& /* a */) {
return os << "AllowsGenericStreamingTemplate";
}
@@ -641,7 +641,7 @@
template <typename Char, typename CharTraits, typename T>
std::basic_ostream<Char, CharTraits>& operator<<(
std::basic_ostream<Char, CharTraits>& os,
- const AllowsGenericStreamingAndImplicitConversionTemplate<T>& a) {
+ const AllowsGenericStreamingAndImplicitConversionTemplate<T>& /* a */) {
return os << "AllowsGenericStreamingAndImplicitConversionTemplate";
}
diff --git a/test/gmock-spec-builders_test.cc b/test/gmock-spec-builders_test.cc
index 5fd9711..c1e7738 100644
--- a/test/gmock-spec-builders_test.cc
+++ b/test/gmock-spec-builders_test.cc
@@ -97,16 +97,26 @@
class MockA {
public:
+ MockA() {}
+
MOCK_METHOD1(DoA, void(int n)); // NOLINT
MOCK_METHOD1(ReturnResult, Result(int n)); // NOLINT
MOCK_METHOD2(Binary, bool(int x, int y)); // NOLINT
MOCK_METHOD2(ReturnInt, int(int x, int y)); // NOLINT
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(MockA);
};
class MockB {
public:
+ MockB() {}
+
MOCK_CONST_METHOD0(DoB, int()); // NOLINT
MOCK_METHOD1(DoB, int(int n)); // NOLINT
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(MockB);
};
// Tests that EXPECT_CALL and ON_CALL compile in a presence of macro
@@ -123,7 +133,12 @@
};
class MockCC : public CC {
public:
+ MockCC() {}
+
MOCK_METHOD0(Method, int());
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(MockCC);
};
// Tests that a method with expanded name compiles.
@@ -1617,8 +1632,19 @@
// Tests that it's OK to delete a mock object itself in its action.
+// Suppresses warning on unreferenced formal parameter in MSVC with
+// -W4.
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4100)
+#endif
+
ACTION_P(Delete, ptr) { delete ptr; }
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
TEST(DeletingMockEarlyTest, CanDeleteSelfInActionReturningVoid) {
MockA* const a = new MockA;
EXPECT_CALL(*a, DoA(_)).WillOnce(Delete(a));
@@ -1691,7 +1717,9 @@
}
// Returns true iff call_count calls will saturate this cardinality.
- virtual bool IsSaturatedByCallCount(int call_count) const { return false; }
+ virtual bool IsSaturatedByCallCount(int /* call_count */) const {
+ return false;
+ }
// Describes self to an ostream.
virtual void DescribeTo(::std::ostream* os) const {
@@ -1740,9 +1768,14 @@
class MockC {
public:
+ MockC() {}
+
MOCK_METHOD6(VoidMethod, void(bool cond, int n, string s, void* p,
const Printable& x, Unprintable y));
MOCK_METHOD0(NonVoidMethod, int()); // NOLINT
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(MockC);
};
// TODO(wan@google.com): find a way to re-enable these tests.
@@ -1935,7 +1968,12 @@
class LogTestHelper {
public:
+ LogTestHelper() {}
+
MOCK_METHOD1(Foo, PrintMeNot(PrintMeNot));
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(LogTestHelper);
};
class GMockLogTest : public ::testing::Test {
diff --git a/test/gmock_leak_test_.cc b/test/gmock_leak_test_.cc
index 157bd7e..24dfc1f 100644
--- a/test/gmock_leak_test_.cc
+++ b/test/gmock_leak_test_.cc
@@ -48,7 +48,12 @@
class MockFoo : public FooInterface {
public:
+ MockFoo() {}
+
MOCK_METHOD0(DoThis, void());
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFoo);
};
TEST(LeakTest, LeakedMockWithExpectCallCausesFailureWhenLeakCheckingIsEnabled) {
diff --git a/test/gmock_link_test.h b/test/gmock_link_test.h
index 40554bf..d963590 100644
--- a/test/gmock_link_test.h
+++ b/test/gmock_link_test.h
@@ -206,6 +206,8 @@
class Mock: public Interface {
public:
+ Mock() {}
+
MOCK_METHOD1(VoidFromString, void(char* str));
MOCK_METHOD1(StringFromString, char*(char* str));
MOCK_METHOD1(IntFromString, int(char* str));
@@ -215,6 +217,9 @@
MOCK_METHOD1(VoidFromFloat, void(float n));
MOCK_METHOD1(VoidFromDouble, void(double n));
MOCK_METHOD1(VoidFromVector, void(const std::vector<int>& v));
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(Mock);
};
class InvokeHelper {
@@ -229,7 +234,7 @@
class FieldHelper {
public:
- FieldHelper(int field) : field_(field) {}
+ FieldHelper(int a_field) : field_(a_field) {}
int field() const { return field_; }
int field_; // NOLINT -- need external access to field_ to test
// the Field matcher.
@@ -410,6 +415,16 @@
}
#endif // GTEST_HAS_EXCEPTIONS
+// The ACTION*() macros trigger warning C4100 (unreferenced formal
+// parameter) in MSVC with -W4. Unfortunately they cannot be fixed in
+// the macro definition, as the warnings are generated when the macro
+// is expanded and macro expansion cannot contain #pragma. Therefore
+// we suppress them here.
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4100)
+#endif
+
// Tests the linkage of actions created using ACTION macro.
namespace {
ACTION(Return1) { return 1; }
@@ -441,6 +456,10 @@
}
}
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
TEST(LinkTest, TestActionP2Macro) {
Mock mock;
char ch = 'x';
diff --git a/test/gmock_output_test_.cc b/test/gmock_output_test_.cc
index c33dc6f..24c9b38 100644
--- a/test/gmock_output_test_.cc
+++ b/test/gmock_output_test_.cc
@@ -49,9 +49,14 @@
class MockFoo {
public:
+ MockFoo() {}
+
MOCK_METHOD3(Bar, char(const std::string& s, int i, double x));
MOCK_METHOD2(Bar2, bool(int x, int y));
MOCK_METHOD2(Bar3, void(int x, int y));
+
+ private:
+ GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFoo);
};
class GMockOutputTest : public testing::Test {