Migrate from googletest 1.8 to googletest 1.10 (#67)

Summary:
X-link: facebookincubator/hsthrift#67

Updating `googletest` from `1.8.0` to `1.10.0`

Reviewed By: mzlee, igorsugak, luciang, meyering, r-barnes

Differential Revision: D34351084

fbshipit-source-id: 939b3985ab63a06b6d511ec8711c2d5863bdfea8

Author: dimitribouche

test/Makefile.am

@@ -2,22 +2,22 @@ SUBDIRS = . integ unit
 
 check_LTLIBRARIES = libgtest.la libgtest_main.la libgmock_main.la
 
-libgtest_la_CPPFLAGS = -Igoogletest-release-1.8.0/googletest -Igoogletest-release-1.8.0/googletest/src -Igoogletest-release-1.8.0/googletest/include
-libgtest_la_SOURCES = googletest-release-1.8.0/googletest/src/gtest-all.cc
+libgtest_la_CPPFLAGS = -Igoogletest-release-1.10.0/googletest -Igoogletest-release-1.10.0/googletest/src -Igoogletest-release-1.10.0/googletest/include
+libgtest_la_SOURCES = googletest-release-1.10.0/googletest/src/gtest-all.cc
 
-libgtest_main_la_CPPFLAGS = -Igoogletest-release-1.8.0/googletest -Igoogletest-release-1.8.0/googletest/src -Igoogletest-release-1.8.0/googletest/include
-libgtest_main_la_SOURCES = googletest-release-1.8.0/googletest/src/gtest_main.cc
+libgtest_main_la_CPPFLAGS = -Igoogletest-release-1.10.0/googletest -Igoogletest-release-1.10.0/googletest/src -Igoogletest-release-1.10.0/googletest/include
+libgtest_main_la_SOURCES = googletest-release-1.10.0/googletest/src/gtest_main.cc
 libgtest_main_la_LIBADD = libgtest.la
 
-libgmock_main_la_CPPFLAGS = -Igoogletest-release-1.8.0/googlemock -Igoogletest-release-1.8.0/googlemock/src -Igoogletest-release-1.8.0/googlemock/include -Igoogletest-release-1.8.0/googletest/include
-libgmock_main_la_SOURCES = googletest-release-1.8.0/googlemock/src/gmock-all.cc googletest-release-1.8.0/googlemock/src/gmock_main.cc
+libgmock_main_la_CPPFLAGS = -Igoogletest-release-1.10.0/googlemock -Igoogletest-release-1.10.0/googlemock/src -Igoogletest-release-1.10.0/googlemock/include -Igoogletest-release-1.10.0/googletest/include
+libgmock_main_la_SOURCES = googletest-release-1.10.0/googlemock/src/gmock-all.cc googletest-release-1.10.0/googlemock/src/gmock_main.cc
 
 # Hack: auto-download googletest.
 
-googletest-release-1.8.0/googletest/src/gtest-all.cc \
-googletest-release-1.8.0/googletest/src/gtest_main.cc \
-googletest-release-1.8.0/googlemock/src/gmock-all.cc \
-googletest-release-1.8.0/googlemock/src/gmock_main.cc: setup_gtest
+googletest-release-1.10.0/googletest/src/gtest-all.cc \
+googletest-release-1.10.0/googletest/src/gtest_main.cc \
+googletest-release-1.10.0/googlemock/src/gmock-all.cc \
+googletest-release-1.10.0/googlemock/src/gmock_main.cc: setup_gtest
 
 setup_gtest:
 	./setup.sh

test/Makefile.inc

@@ -3,8 +3,8 @@
 #
 COMMON_TEST_INCLUDES = \
     -I$(top_srcdir)/test/common \
-    -I$(top_srcdir)/test/googletest-release-1.8.0/googlemock/include \
-    -I$(top_srcdir)/test/googletest-release-1.8.0/googletest/include
+    -I$(top_srcdir)/test/googletest-release-1.10.0/googlemock/include \
+    -I$(top_srcdir)/test/googletest-release-1.10.0/googletest/include
 
 COMMON_BASE_TEST_LIBS = \
 	$(top_builddir)/libredex.la \

test/setup.sh

@@ -9,10 +9,10 @@ set -e
 TEST_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 pushd "$TEST_DIR"
 
-# Note: Use at least 1.8 as we need googlemock, too.
+# Note: Use at least 1.10 as we need googlemock, too.
 
-test -e gtest-1.8.0.zip || {
-    curl https://codeload.github.com/google/googletest/zip/release-1.8.0 \
-         -o gtest-1.8.0.zip
-    unzip -o gtest-1.8.0.zip
+test -e gtest-1.10.0.zip || {
+    curl https://codeload.github.com/google/googletest/zip/release-1.10.0 \
+         -o gtest-1.10.0.zip
+    unzip -o gtest-1.10.0.zip
 }

test/unit/IRTypeCheckerTest.cpp

@@ -95,7 +95,7 @@ struct TestValueType {
  */
 void field_incompatible_fail_helper(const TestValueType& a_type,
                                     const TestValueType& b_type,
-                                    const internal::string& exp_fail_str,
+                                    const std::string& exp_fail_str,
                                     IROpcode opcode_to_test,
                                     bool is_put,
                                     OperandType ir_suffix,
@@ -181,7 +181,7 @@ void field_incompatible_fail_helper(const TestValueType& a_type,
   IRTypeChecker checker(method);
   checker.run();
   EXPECT_TRUE(checker.fail());
-  EXPECT_THAT(checker.what(), MatchesRegex(exp_fail_str));
+  EXPECT_THAT(checker.what(), MatchesRegex(exp_fail_str.c_str()));
 }
 
 /**
@@ -2107,8 +2107,8 @@ TEST_F(IRTypeCheckerTest, putShortFieldIncompatibleClassFail) {
   TestValueType b_type(dex_type_b, type::java_lang_Object(), "LB;.<init>:()V",
                        "LB;.f:S;");
 
-  field_incompatible_fail_helper(a_type, b_type, exp_fail_str, op, true, SHORT,
-                                 m_method);
+  field_incompatible_fail_helper(a_type, b_type, exp_fail_str.c_str(), op, true,
+                                 SHORT, m_method);
 }
 
 /**