aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/generator/cpp/gmock_class_test.py
diff options
context:
space:
mode:
authorkosak <kosak@google.com>2014-03-12 23:27:35 +0000
committerkosak <kosak@google.com>2014-03-12 23:27:35 +0000
commitc26f969579d62444ae7d422b37e0037ceca97a7a (patch)
tree191ed20102b39f6405a803e2c670ff6b115950e6 /scripts/generator/cpp/gmock_class_test.py
parentb6a348862b3ef745ae4c43117b67c7c6f877cd7e (diff)
downloadgoogletest-c26f969579d62444ae7d422b37e0037ceca97a7a.tar.gz
googletest-c26f969579d62444ae7d422b37e0037ceca97a7a.tar.bz2
googletest-c26f969579d62444ae7d422b37e0037ceca97a7a.zip
Make the gmock generator work with the 'override' keyword. Also pull in gtest 680.
Diffstat (limited to 'scripts/generator/cpp/gmock_class_test.py')
-rwxr-xr-xscripts/generator/cpp/gmock_class_test.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/scripts/generator/cpp/gmock_class_test.py b/scripts/generator/cpp/gmock_class_test.py
index 07d59571..361dad7f 100755
--- a/scripts/generator/cpp/gmock_class_test.py
+++ b/scripts/generator/cpp/gmock_class_test.py
@@ -65,6 +65,17 @@ class Foo {
'MOCK_METHOD0(Bar,\nint());',
self.GenerateMethodSource(source))
+ def testSimpleOverrideMethod(self):
+ source = """
+class Foo {
+ public:
+ int Bar() override;
+};
+"""
+ self.assertEqualIgnoreLeadingWhitespace(
+ 'MOCK_METHOD0(Bar,\nint());',
+ self.GenerateMethodSource(source))
+
def testSimpleConstMethod(self):
source = """
class Foo {