commit f6d6a22b8eea931b49a8c33de3092d4623ed0d41
author zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> Tue Dec 01 19:42:25 2009 +0000
committer zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> Tue Dec 01 19:42:25 2009 +0000
tree a0608d2270992b90160a57c68014fb65ade117df
parent 19eb9e9e3d4d5a4f0eee786d7664ca0e45137390

Fixes Cygwin compatibility (by Vlad Losev); Improves Python tests (by Vlad Losev); Fixes ambiguous call to implicit_cast; Uses gtest's SkipPrefix() instead gmock's own (by Vlad Losev).

test/gmock-printers_test.cc

diff --git a/test/gmock-printers_test.cc b/test/gmock-printers_test.cc
index c72e3d3..e195620 100644
--- a/test/gmock-printers_test.cc
+++ b/test/gmock-printers_test.cc
@@ -443,8 +443,14 @@
 void MyFunction(int n) {}
 
 TEST(PrintPointerTest, NonMemberFunctionPointer) {
-  EXPECT_EQ(PrintPointer(reinterpret_cast<const void*>(&MyFunction)),
-            Print(&MyFunction));
+  // We cannot directly cast &MyFunction to const void* because the
+  // standard disallows casting between pointers to functions and
+  // pointers to objects, and some compilers (e.g. GCC 3.4) enforce
+  // this limitation.
+  EXPECT_EQ(
+      PrintPointer(reinterpret_cast<const void*>(
+          reinterpret_cast<internal::BiggestInt>(&MyFunction))),
+      Print(&MyFunction));
   int (*p)(bool) = NULL;  // NOLINT
   EXPECT_EQ("NULL", Print(p));
 }
@@ -973,7 +979,12 @@
   void (*fp)(int n) = &MyFunction;
   const string fp_pointer_string =
       PrintPointer(reinterpret_cast<const void*>(&fp));
-  const string fp_string = PrintPointer(reinterpret_cast<const void*>(fp));
+  // We cannot directly cast &MyFunction to const void* because the
+  // standard disallows casting between pointers to functions and
+  // pointers to objects, and some compilers (e.g. GCC 3.4) enforce
+  // this limitation.
+  const string fp_string = PrintPointer(reinterpret_cast<const void*>(
+      reinterpret_cast<internal::BiggestInt>(fp)));
   EXPECT_EQ("@" + fp_pointer_string + " " + fp_string,
             PrintByRef(fp));
 }

test/gmock_leak_test.py

diff --git a/test/gmock_leak_test.py b/test/gmock_leak_test.py
index 429cc6a..38ff9d0 100755
--- a/test/gmock_leak_test.py
+++ b/test/gmock_leak_test.py
@@ -33,8 +33,6 @@
 
 __author__ = 'wan@google.com (Zhanyong Wan)'
 
-import os
-import unittest
 
 import gmock_test_utils
 
@@ -45,7 +43,7 @@
 TEST_MULTIPLE_LEAKS = [PROGRAM_PATH, '--gtest_filter=*MultipleLeaked*']
 
 
-class GMockLeakTest(unittest.TestCase):
+class GMockLeakTest(gmock_test_utils.TestCase):
 
   def testCatchesLeakedMockByDefault(self):
     self.assertNotEqual(

test/gmock_output_test.py

diff --git a/test/gmock_output_test.py b/test/gmock_output_test.py
index c5f05b3..614a58f 100755
--- a/test/gmock_output_test.py
+++ b/test/gmock_output_test.py
@@ -43,7 +43,6 @@
 import os
 import re
 import sys
-import unittest
 
 import gmock_test_utils
 
@@ -154,7 +153,7 @@
   return GetNormalizedOutputAndLeakyTests(GetShellCommandOutput(cmd))
 
 
-class GMockOutputTest(unittest.TestCase):
+class GMockOutputTest(gmock_test_utils.TestCase):
   def testOutput(self):
     (output, leaky_tests) = GetNormalizedCommandOutputAndLeakyTests(COMMAND)
     golden_file = open(GOLDEN_PATH, 'rb')

test/gmock_test_utils.py

diff --git a/test/gmock_test_utils.py b/test/gmock_test_utils.py
index ae15a10..fa896a4 100755
--- a/test/gmock_test_utils.py
+++ b/test/gmock_test_utils.py
@@ -36,6 +36,7 @@
 import os
 import sys
 
+
 # Determines path to gtest_test_utils and imports it.
 SCRIPT_DIR = os.path.dirname(__file__) or '.'
 
@@ -144,8 +145,16 @@
       return -1
 
 
+# Suppresses the "Invalid const name" lint complaint
+# pylint: disable-msg=C6409
+
 # Exposes Subprocess from gtest_test_utils.
-Subprocess = gtest_test_utils.Subprocess  # pylint: disable-msg=C6409
+Subprocess = gtest_test_utils.Subprocess
+
+# Exposes TestCase from gtest_test_utils.
+TestCase = gtest_test_utils.TestCase
+
+# pylint: enable-msg=C6409
 
 
 def Main():