From f7779eb3cb5d70387c747b9e4b7a1c839e1e1856 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Tue, 20 Nov 2018 10:39:44 -0500 Subject: Googletest export Remove unintended dependency. PiperOrigin-RevId: 222243874 --- googlemock/test/gmock-pp-string_test.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'googlemock/test/gmock-pp-string_test.cc') diff --git a/googlemock/test/gmock-pp-string_test.cc b/googlemock/test/gmock-pp-string_test.cc index 4147a844..6f66cf15 100644 --- a/googlemock/test/gmock-pp-string_test.cc +++ b/googlemock/test/gmock-pp-string_test.cc @@ -32,8 +32,8 @@ // This file tests the internal preprocessor macro library. #include "gmock/internal/gmock-pp.h" -#include "absl/strings/str_join.h" -#include "absl/strings/str_split.h" +#include + #include "gmock/gmock.h" namespace testing { @@ -41,9 +41,11 @@ namespace { // Matcher to verify that to strings are identical up to whitespace // Not 100% correct, because it treats "AB" as equal to "A B". -::testing::Matcher SameExceptSpaces(absl::string_view s) { - auto remove_spaces = [](const absl::string_view& to_split) { - return absl::StrJoin(absl::StrSplit(to_split, ' '), ""); +::testing::Matcher SameExceptSpaces(const std::string& s) { + auto remove_spaces = [](std::string to_split) { + to_split.erase(std::remove(to_split.begin(), to_split.end(), ' '), + to_split.end()); + return to_split; }; return ::testing::ResultOf(remove_spaces, remove_spaces(s)); } -- cgit v1.2.3