Update gmock and gtest.

testing/gmock/test/gmock-generated-function-mockers_test.cc

 // Copyright 2007, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 96 matching lines @@
   STDMETHOD_(int, CTNullary)() = 0;
   STDMETHOD_(bool, CTUnary)(int x) = 0;
   STDMETHOD_(int, CTDecimal)(bool b, char c, short d, int e, long f,  // NOLINT
       float g, double h, unsigned i, char* j, const string& k) = 0;
   STDMETHOD_(char, CTConst)(int x) const = 0;
 #endif  // GTEST_OS_WINDOWS
 };
 
 class MockFoo : public FooInterface {
  public:
+  MockFoo() {}
+
   // Makes sure that a mock function parameter can be named.
   MOCK_METHOD1(VoidReturning, void(int n));  // NOLINT
 
   MOCK_METHOD0(Nullary, int());  // NOLINT
 
   // Makes sure that a mock function parameter can be unnamed.
   MOCK_METHOD1(Unary, bool(int));  // NOLINT
   MOCK_METHOD2(Binary, long(short, int));  // NOLINT
   MOCK_METHOD10(Decimal, int(bool, char, short, int, long, float,  // NOLINT
                              double, unsigned, char*, const string& str));
@@ skipping 15 matching lines @@
   MOCK_METHOD1(TypeWithHole, int(int (*)()));  // NOLINT
   MOCK_METHOD1(TypeWithComma, int(const std::map<int, string>&));  // NOLINT
 #if GTEST_OS_WINDOWS
   MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, CTNullary, int());
   MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, CTUnary, bool(int));
   MOCK_METHOD10_WITH_CALLTYPE(STDMETHODCALLTYPE, CTDecimal, int(bool b, char c,
       short d, int e, long f, float g, double h, unsigned i, char* j,
       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 {
  protected:
   FunctionMockerTest() : foo_(&mock_foo_) {}
 
   FooInterface* const foo_;
   MockFoo mock_foo_;
 };
 
@@ skipping 136 matching lines @@
   EXPECT_CALL(Const(mock_foo_), CTConst(_))
       .WillOnce(Return('a'));
 
   EXPECT_EQ('a', Const(*foo_).CTConst(0));
 }
 
 #endif  // GTEST_OS_WINDOWS
 
 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
 // number of times.
 TEST(ExpectCallTest, UnmentionedFunctionCanBeCalledAnyNumberOfTimes) {
   {
     MockB b;
   }
 
   {
@@ skipping 19 matching lines @@
   virtual void Push(const T& value) = 0;
   virtual void Pop() = 0;
   virtual int GetSize() const = 0;
   // Template parameter appears in function return type.
   virtual const T& GetTop() const = 0;
 };
 
 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.
 TEST(TemplateMockTest, Works) {
   MockStack<int> mock;
 
   EXPECT_CALL(mock, GetSize())
       .WillOnce(Return(0))
       .WillOnce(Return(1))
       .WillOnce(Return(0));
@@ skipping 24 matching lines @@
   STDMETHOD_(void, Push)(const T& value) = 0;
   STDMETHOD_(void, Pop)() = 0;
   STDMETHOD_(int, GetSize)() const = 0;
   // Template parameter appears in function return type.
   STDMETHOD_(const T&, GetTop)() const = 0;
 };
 
 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.
 TEST(TemplateMockTestWithCallType, Works) {
   MockStackWithCallType<int> mock;
 
   EXPECT_CALL(mock, GetSize())
       .WillOnce(Return(0))
       .WillOnce(Return(1))
       .WillOnce(Return(0));
@@ skipping 13 matching lines @@
 }
 #endif  // GTEST_OS_WINDOWS
 
 #define MY_MOCK_METHODS1_ \
     MOCK_METHOD0(Overloaded, void()); \
     MOCK_CONST_METHOD1(Overloaded, int(int n)); \
     MOCK_METHOD2(Overloaded, bool(bool f, int n))
 
 class MockOverloadedOnArgNumber {
  public:
+  MockOverloadedOnArgNumber() {}
+
   MY_MOCK_METHODS1_;
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockOverloadedOnArgNumber);
 };
 
 TEST(OverloadedMockMethodTest, CanOverloadOnArgNumberInMacroBody) {
   MockOverloadedOnArgNumber mock;
   EXPECT_CALL(mock, Overloaded());
   EXPECT_CALL(mock, Overloaded(1)).WillOnce(Return(2));
   EXPECT_CALL(mock, Overloaded(true, 1)).WillOnce(Return(true));
 
   mock.Overloaded();
   EXPECT_EQ(2, mock.Overloaded(1));
   EXPECT_TRUE(mock.Overloaded(true, 1));
 }
 
 #define MY_MOCK_METHODS2_ \
     MOCK_CONST_METHOD1(Overloaded, int(int n)); \
     MOCK_METHOD1(Overloaded, int(int n));
 
 class MockOverloadedOnConstness {
  public:
+  MockOverloadedOnConstness() {}
+
   MY_MOCK_METHODS2_;
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockOverloadedOnConstness);
 };
 
 TEST(OverloadedMockMethodTest, CanOverloadOnConstnessInMacroBody) {
   MockOverloadedOnConstness mock;
   const MockOverloadedOnConstness* const_mock = &mock;
   EXPECT_CALL(mock, Overloaded(1)).WillOnce(Return(2));
   EXPECT_CALL(*const_mock, Overloaded(1)).WillOnce(Return(3));
 
   EXPECT_EQ(2, mock.Overloaded(1));
   EXPECT_EQ(3, const_mock->Overloaded(1));
@@ skipping 37 matching lines @@
                    int a5, int a6, char a7, int a8, bool a9)> foo;
   EXPECT_CALL(foo, Call(_, 'a', _, _, _, _, _, _, _, _))
       .WillOnce(Return(1))
       .WillOnce(Return(2));
   EXPECT_EQ(1, foo.Call(false, 'a', 0, 0, 0, 0, 0, 'b', 0, true));
   EXPECT_EQ(2, foo.Call(true, 'a', 0, 0, 0, 0, 0, 'b', 1, false));
 }
 
 }  // namespace gmock_generated_function_mockers_test
 }  // namespace testing