diff --git a/tensorstore/internal/BUILD b/tensorstore/internal/BUILD index e8b215414..8a50b9d31 100644 --- a/tensorstore/internal/BUILD +++ b/tensorstore/internal/BUILD @@ -757,7 +757,6 @@ tensorstore_cc_library( ":json_pointer", "//tensorstore/internal/json:same", "//tensorstore/util:quote_string", - "//tensorstore/util:status_testutil", "@com_github_nlohmann_json//:nlohmann_json", "@com_google_googletest//:gtest", ], diff --git a/tensorstore/internal/json_gtest.cc b/tensorstore/internal/json_gtest.cc index 042b24409..fb4a91bde 100644 --- a/tensorstore/internal/json_gtest.cc +++ b/tensorstore/internal/json_gtest.cc @@ -14,11 +14,14 @@ #include "tensorstore/internal/json_gtest.h" +#include #include #include #include #include +#include +#include #include "tensorstore/internal/json/same.h" #include "tensorstore/internal/json_pointer.h" #include "tensorstore/util/quote_string.h" @@ -127,19 +130,9 @@ ::testing::Matcher<::nlohmann::json> JsonSubValueMatches( return JsonSubValueMatches(std::move(json_pointer), MatchesJson(std::move(value_matcher))); } -::testing::Matcher<::nlohmann::json> JsonSubValuesMatch( - std::vector> matchers) { - std::vector<::testing::Matcher<::nlohmann::json>> all; - all.reserve(matchers.size()); - for (const auto& p : matchers) { - all.push_back(JsonSubValueMatches(p.first, p.second)); - } - return ::testing::AllOfArray(all); -} ::testing::Matcher<::nlohmann::json> JsonSubValuesMatch( - std::vector>> - matchers) { + std::vector> matchers) { std::vector<::testing::Matcher<::nlohmann::json>> all; all.reserve(matchers.size()); for (const auto& p : matchers) { diff --git a/tensorstore/internal/json_gtest.h b/tensorstore/internal/json_gtest.h index 1c5619b25..ec003aeb6 100644 --- a/tensorstore/internal/json_gtest.h +++ b/tensorstore/internal/json_gtest.h @@ -16,11 +16,12 @@ #define TENSORSTORE_INTERNAL_JSON_GTEST_H_ #include +#include +#include #include #include #include -#include "tensorstore/util/status_testutil.h" namespace nlohmann { // @@ -74,9 +75,6 @@ ::testing::Matcher<::nlohmann::json> JsonSubValueMatches( /// EXPECT_THAT(obj, JsonSubValuesMatch({{"/a", 123}, {"/b/c", "xyz"}})); ::testing::Matcher<::nlohmann::json> JsonSubValuesMatch( std::vector> matchers); -::testing::Matcher<::nlohmann::json> JsonSubValuesMatch( - std::vector>> - matchers); } // namespace tensorstore