Make the gmock generator work with the 'override' keyword. Also pull in gtest 680.

2014-03-12 23:27:35 +00:00
parent b6a348862b
commit c26f969579
3 changed files with 17 additions and 2 deletions
--- a/scripts/generator/cpp/gmock_class_test.py
+++ b/scripts/generator/cpp/gmock_class_test.py
@@ -60,6 +60,17 @@ class Foo {
 public:
  virtual int Bar();
 };
+"""
+    self.assertEqualIgnoreLeadingWhitespace(
+        'MOCK_METHOD0(Bar,\nint());',
+        self.GenerateMethodSource(source))
+
+  def testSimpleOverrideMethod(self):
+    source = """
+class Foo {
+ public:
+  int Bar() override;
+};
 """
    self.assertEqualIgnoreLeadingWhitespace(
        'MOCK_METHOD0(Bar,\nint());',