aboutsummaryrefslogtreecommitdiffstats
path: root/test/gtest-tuple_test.cc
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-11-24 20:19:45 +0000
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-11-24 20:19:45 +0000
commit2e075a7f60da95cd02a3935fda49d222a435d56a (patch)
tree38f5aae68b5e0a48991fdcbd7729647c9213fdfa /test/gtest-tuple_test.cc
parentb6fe6899bef6dd90572fc0e7f12912d9ad87a19e (diff)
downloadgoogletest-2e075a7f60da95cd02a3935fda49d222a435d56a.tar.gz
googletest-2e075a7f60da95cd02a3935fda49d222a435d56a.tar.bz2
googletest-2e075a7f60da95cd02a3935fda49d222a435d56a.zip
Refactors run_tests.py s.t. it can be shared by gmock (by Vlad Losev); Fixes a warning in gtest-tuple_test.cc on Cygwin (by Vlad Losev).
Diffstat (limited to 'test/gtest-tuple_test.cc')
-rw-r--r--test/gtest-tuple_test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/gtest-tuple_test.cc b/test/gtest-tuple_test.cc
index ca5232ee..532f70b3 100644
--- a/test/gtest-tuple_test.cc
+++ b/test/gtest-tuple_test.cc
@@ -159,7 +159,7 @@ TEST(TupleConstructorTest, DefaultConstructorDefaultInitializesEachField) {
b3 = a3;
EXPECT_EQ(0.0, get<0>(b3));
EXPECT_EQ('\0', get<1>(b3));
- EXPECT_EQ(NULL, get<2>(b3));
+ EXPECT_TRUE(get<2>(b3) == NULL);
tuple<int, int, int, int, int, int, int, int, int, int> a10, b10;
b10 = a10;