From: Xiaoyi Zhang <zhangxy@google.com>
Date: Tue, 21 Jan 2020 21:26:24 +0000 (-0500)
Subject: Merge pull request #2665 from bysreg:fix_noshortcircuitfailure_detectsflakyshortcircu... 
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9417fb401a578b32656f7c4d05a0e6a18940b825;p=googletest.git

Merge pull request #2665 from bysreg:fix_noshortcircuitfailure_detectsflakyshortcircuit_test

PiperOrigin-RevId: 290256504
---

9417fb401a578b32656f7c4d05a0e6a18940b825
diff --cc googlemock/test/gmock-matchers_test.cc
index e6e8c8f,96ca895..c667ecb
--- a/googlemock/test/gmock-matchers_test.cc
+++ b/googlemock/test/gmock-matchers_test.cc
@@@ -6885,7 -6885,7 +6885,8 @@@ TEST_F(PredicateFormatterFromMatcherTes
    EXPECT_FALSE(result);  // Implicit cast to bool.
    std::string expect =
        "Value of: dummy-name\nExpected: [DescribeTo]\n"
-       "  Actual: 1, [MatchAndExplain]";
 -      "  Actual: 1" + OfType(internal::GetTypeName<Behavior>()) + ", [MatchAndExplain]";
++      "  Actual: 1" +
++      OfType(internal::GetTypeName<Behavior>()) + ", [MatchAndExplain]";
    EXPECT_EQ(expect, result.message());
  }
  
@@@ -6896,7 -6896,7 +6897,8 @@@ TEST_F(PredicateFormatterFromMatcherTes
        "Value of: dummy-name\nExpected: [DescribeTo]\n"
        "  The matcher failed on the initial attempt; but passed when rerun to "
        "generate the explanation.\n"
-       "  Actual: 2, [MatchAndExplain]";
 -      "  Actual: 2" + OfType(internal::GetTypeName<Behavior>()) + ", [MatchAndExplain]";
++      "  Actual: 2" +
++      OfType(internal::GetTypeName<Behavior>()) + ", [MatchAndExplain]";
    EXPECT_EQ(expect, result.message());
  }