Remove overload of JsonSubValuesMatch

The overload is unused, but also inherently ambiguous. Equivalent tests can be composed via AllOf(JsonSubValueMatches(x, y), ...). PiperOrigin-RevId: 602969618 Change-Id: Idba33825e8bc4f4c4ad98e363d34fe3e33996298
google · Jan 31, 2024 · e4323d2 · e4323d2
1 parent b56fcb4
commit e4323d2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git 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
@@ -14,11 +14,14 @@
 
 #include "tensorstore/internal/json_gtest.h"
 
+#include <ostream>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
+#include <nlohmann/json.hpp>
 #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<std::pair<std::string, ::nlohmann::json>> 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<std::pair<std::string, ::testing::Matcher<::nlohmann::json>>>
-        matchers) {
+    std::vector<std::pair<std::string, ::nlohmann::json>> 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
@@ -16,11 +16,12 @@
 #define TENSORSTORE_INTERNAL_JSON_GTEST_H_
 
 #include <ostream>
+#include <string>
+#include <utility>
 #include <vector>
 
 #include <gmock/gmock.h>
 #include <nlohmann/json.hpp>
-#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<std::pair<std::string, ::nlohmann::json>> matchers);
-::testing::Matcher<::nlohmann::json> JsonSubValuesMatch(
-    std::vector<std::pair<std::string, ::testing::Matcher<::nlohmann::json>>>
-        matchers);
 
 }  // namespace tensorstore