Move protobuf_matchers and status_matchers to a testing package…

… and remove the dependency from the `aggregators` package to the `executors` package. PiperOrigin-RevId: 633375850
google-parfait · May 14, 2024 · 62fd042 · 62fd042
1 parent 796738a
commit 62fd042
Show file tree

Hide file tree

Showing 63 changed files with 178 additions and 167 deletions.
diff --git a/tensorflow_federated/cc/core/impl/aggregation/BUILD b/tensorflow_federated/cc/core/impl/aggregation/BUILD
@@ -16,3 +16,10 @@ package(
     default_applicable_licenses = ["//:package_license"],
     default_visibility = ["//visibility:private"],
 )
+
+package_group(
+    name = "aggregation_packages",
+    packages = [
+        "//tensorflow_federated/cc/core/impl/aggregation/...",
+    ],
+)
diff --git a/tensorflow_federated/cc/core/impl/aggregation/core/BUILD b/tensorflow_federated/cc/core/impl/aggregation/core/BUILD
@@ -178,8 +178,8 @@ cc_test(
         "//tensorflow_federated/cc/core/impl/aggregation/base",
         "//tensorflow_federated/cc/core/impl/aggregation/testing",
         "//tensorflow_federated/cc/core/impl/aggregation/testing:test_data",
-        "//tensorflow_federated/cc/core/impl/executors:protobuf_matchers",
-        "//tensorflow_federated/cc/core/impl/executors:status_matchers",
+        "//tensorflow_federated/cc/core/impl/testing:protobuf_matchers",
+        "//tensorflow_federated/cc/core/impl/testing:status_matchers",
     ],
 )
 
@@ -205,7 +205,7 @@ cc_test(
         "//tensorflow_federated/cc/core/impl/aggregation/base",
         "//tensorflow_federated/cc/core/impl/aggregation/testing",
         "//tensorflow_federated/cc/core/impl/aggregation/testing:test_data",
-        "//tensorflow_federated/cc/core/impl/executors:status_matchers",
+        "//tensorflow_federated/cc/core/impl/testing:status_matchers",
     ],
 )
 
@@ -217,7 +217,7 @@ cc_test(
         ":intrinsic",
         "//tensorflow_federated/cc/common_libs:oss_test_main",
         "//tensorflow_federated/cc/core/impl/aggregation/base",
-        "//tensorflow_federated/cc/core/impl/executors:status_matchers",
+        "//tensorflow_federated/cc/core/impl/testing:status_matchers",
     ],
 )
 
@@ -260,7 +260,7 @@ cc_test(
         "//tensorflow_federated/cc/core/impl/aggregation/base",
         "//tensorflow_federated/cc/core/impl/aggregation/testing",
         "//tensorflow_federated/cc/core/impl/aggregation/testing:test_data",
-        "//tensorflow_federated/cc/core/impl/executors:status_matchers",
+        "//tensorflow_federated/cc/core/impl/testing:status_matchers",
     ],
 )
 
@@ -277,7 +277,7 @@ cc_test(
         "//tensorflow_federated/cc/core/impl/aggregation/base",
         "//tensorflow_federated/cc/core/impl/aggregation/testing",
         "//tensorflow_federated/cc/core/impl/aggregation/testing:test_data",
-        "//tensorflow_federated/cc/core/impl/executors:status_matchers",
+        "//tensorflow_federated/cc/core/impl/testing:status_matchers",
     ],
 )
 
@@ -303,7 +303,7 @@ cc_test(
         "//tensorflow_federated/cc/core/impl/aggregation/base",
         "//tensorflow_federated/cc/core/impl/aggregation/testing",
         "//tensorflow_federated/cc/core/impl/aggregation/testing:test_data",
-        "//tensorflow_federated/cc/core/impl/executors:status_matchers",
+        "//tensorflow_federated/cc/core/impl/testing:status_matchers",
     ],
 )
 
@@ -319,7 +319,7 @@ cc_test(
         "//tensorflow_federated/cc/core/impl/aggregation/base",
         "//tensorflow_federated/cc/core/impl/aggregation/testing",
         "//tensorflow_federated/cc/core/impl/aggregation/testing:test_data",
-        "//tensorflow_federated/cc/core/impl/executors:status_matchers",
+        "//tensorflow_federated/cc/core/impl/testing:status_matchers",
         "@com_google_absl//absl/types:span",
     ],
 )
@@ -330,7 +330,7 @@ cc_test(
     deps = [
         ":tensor",
         "//tensorflow_federated/cc/common_libs:oss_test_main",
-        "//tensorflow_federated/cc/core/impl/executors:status_matchers",
+        "//tensorflow_federated/cc/core/impl/testing:status_matchers",
     ],
 )
 
@@ -341,7 +341,7 @@ cc_test(
         ":tensor",
         ":vector_string_data",
         "//tensorflow_federated/cc/common_libs:oss_test_main",
-        "//tensorflow_federated/cc/core/impl/executors:status_matchers",
+        "//tensorflow_federated/cc/core/impl/testing:status_matchers",
     ],
 )
 
@@ -352,7 +352,7 @@ cc_test(
         ":mutable_string_data",
         ":tensor",
         "//tensorflow_federated/cc/common_libs:oss_test_main",
-        "//tensorflow_federated/cc/core/impl/executors:status_matchers",
+        "//tensorflow_federated/cc/core/impl/testing:status_matchers",
         "@com_google_absl//absl/strings:string_view",
     ],
 )
@@ -368,7 +368,7 @@ cc_test(
         "//tensorflow_federated/cc/core/impl/aggregation/base",
         "//tensorflow_federated/cc/core/impl/aggregation/testing",
         "//tensorflow_federated/cc/core/impl/aggregation/testing:test_data",
-        "//tensorflow_federated/cc/core/impl/executors:status_matchers",
+        "//tensorflow_federated/cc/core/impl/testing:status_matchers",
     ],
 )
 
@@ -385,7 +385,7 @@ cc_test(
         "//tensorflow_federated/cc/core/impl/aggregation/base",
         "//tensorflow_federated/cc/core/impl/aggregation/testing",
         "//tensorflow_federated/cc/core/impl/aggregation/testing:test_data",
-        "//tensorflow_federated/cc/core/impl/executors:status_matchers",
+        "//tensorflow_federated/cc/core/impl/testing:status_matchers",
     ],
 )
 
@@ -403,7 +403,7 @@ cc_test(
         "//tensorflow_federated/cc/core/impl/aggregation/base",
         "//tensorflow_federated/cc/core/impl/aggregation/testing",
         "//tensorflow_federated/cc/core/impl/aggregation/testing:test_data",
-        "//tensorflow_federated/cc/core/impl/executors:status_matchers",
+        "//tensorflow_federated/cc/core/impl/testing:status_matchers",
     ],
 )
 
@@ -419,7 +419,7 @@ cc_test(
         "//tensorflow_federated/cc/core/impl/aggregation/base",
         "//tensorflow_federated/cc/core/impl/aggregation/testing",
         "//tensorflow_federated/cc/core/impl/aggregation/testing:test_data",
-        "//tensorflow_federated/cc/core/impl/executors:status_matchers",
+        "//tensorflow_federated/cc/core/impl/testing:status_matchers",
     ],
 )
 
@@ -437,7 +437,7 @@ cc_test(
         "//tensorflow_federated/cc/core/impl/aggregation/base",
         "//tensorflow_federated/cc/core/impl/aggregation/testing",
         "//tensorflow_federated/cc/core/impl/aggregation/testing:test_data",
-        "//tensorflow_federated/cc/core/impl/executors:status_matchers",
+        "//tensorflow_federated/cc/core/impl/testing:status_matchers",
         "@com_google_absl//absl/strings",
     ],
 )

diff --git a/tensorflow_federated/cc/core/impl/aggregation/core/agg_vector_aggregator_test.cc b/tensorflow_federated/cc/core/impl/aggregation/core/agg_vector_aggregator_test.cc
@@ -32,7 +32,7 @@
 #include "tensorflow_federated/cc/core/impl/aggregation/core/tensor_shape.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/test_data.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/testing.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h"
 
 namespace tensorflow_federated {
 namespace aggregation {

diff --git a/tensorflow_federated/cc/core/impl/aggregation/core/composite_key_combiner_test.cc b/tensorflow_federated/cc/core/impl/aggregation/core/composite_key_combiner_test.cc
@@ -31,7 +31,7 @@
 #include "tensorflow_federated/cc/core/impl/aggregation/core/tensor_shape.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/test_data.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/testing.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h"
 
 namespace tensorflow_federated {
 namespace aggregation {

diff --git a/tensorflow_federated/cc/core/impl/aggregation/core/dp_composite_key_combiner_test.cc b/tensorflow_federated/cc/core/impl/aggregation/core/dp_composite_key_combiner_test.cc
@@ -33,7 +33,7 @@
 #include "tensorflow_federated/cc/core/impl/aggregation/core/tensor_shape.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/test_data.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/testing.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h"
 
 namespace tensorflow_federated {
 namespace aggregation {

diff --git a/tensorflow_federated/cc/core/impl/aggregation/core/dp_group_by_aggregator_test.cc b/tensorflow_federated/cc/core/impl/aggregation/core/dp_group_by_aggregator_test.cc
@@ -41,7 +41,7 @@
 #include "tensorflow_federated/cc/core/impl/aggregation/core/tensor_spec.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/test_data.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/testing.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h"
 
 namespace tensorflow_federated {
 namespace aggregation {

diff --git a/tensorflow_federated/cc/core/impl/aggregation/core/dp_grouping_federated_sum_test.cc b/tensorflow_federated/cc/core/impl/aggregation/core/dp_grouping_federated_sum_test.cc
@@ -40,7 +40,7 @@
 #include "tensorflow_federated/cc/core/impl/aggregation/core/tensor_spec.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/test_data.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/testing.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h"
 
 namespace tensorflow_federated {
 namespace aggregation {

diff --git a/tensorflow_federated/cc/core/impl/aggregation/core/federated_mean_test.cc b/tensorflow_federated/cc/core/impl/aggregation/core/federated_mean_test.cc
@@ -29,7 +29,7 @@
 #include "tensorflow_federated/cc/core/impl/aggregation/core/tensor_spec.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/test_data.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/testing.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h"
 
 namespace tensorflow_federated {
 namespace aggregation {

diff --git a/tensorflow_federated/cc/core/impl/aggregation/core/federated_sum_test.cc b/tensorflow_federated/cc/core/impl/aggregation/core/federated_sum_test.cc
@@ -28,7 +28,7 @@
 #include "tensorflow_federated/cc/core/impl/aggregation/core/tensor_spec.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/test_data.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/testing.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h"
 
 namespace tensorflow_federated {
 namespace aggregation {

diff --git a/tensorflow_federated/cc/core/impl/aggregation/core/group_by_aggregator_test.cc b/tensorflow_federated/cc/core/impl/aggregation/core/group_by_aggregator_test.cc
@@ -32,7 +32,7 @@
 #include "tensorflow_federated/cc/core/impl/aggregation/core/tensor_spec.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/test_data.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/testing.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h"
 
 namespace tensorflow_federated {
 namespace aggregation {

diff --git a/tensorflow_federated/cc/core/impl/aggregation/core/grouping_federated_sum_test.cc b/tensorflow_federated/cc/core/impl/aggregation/core/grouping_federated_sum_test.cc
@@ -30,7 +30,7 @@
 #include "tensorflow_federated/cc/core/impl/aggregation/core/tensor_spec.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/test_data.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/testing.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h"
 
 namespace tensorflow_federated {
 namespace aggregation {

diff --git a/tensorflow_federated/cc/core/impl/aggregation/core/mutable_string_data_test.cc b/tensorflow_federated/cc/core/impl/aggregation/core/mutable_string_data_test.cc
@@ -20,7 +20,7 @@
 #include "googletest/include/gtest/gtest.h"
 #include "absl/strings/string_view.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/core/datatype.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h"
 
 namespace tensorflow_federated {
 namespace aggregation {

diff --git a/tensorflow_federated/cc/core/impl/aggregation/core/mutable_vector_data_test.cc b/tensorflow_federated/cc/core/impl/aggregation/core/mutable_vector_data_test.cc
@@ -22,7 +22,7 @@
 
 #include "googlemock/include/gmock/gmock.h"
 #include "googletest/include/gtest/gtest.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h"
 
 namespace tensorflow_federated {
 namespace aggregation {

diff --git a/tensorflow_federated/cc/core/impl/aggregation/core/one_dim_grouping_aggregator_test.cc b/tensorflow_federated/cc/core/impl/aggregation/core/one_dim_grouping_aggregator_test.cc
@@ -30,7 +30,7 @@
 #include "tensorflow_federated/cc/core/impl/aggregation/core/tensor_shape.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/test_data.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/testing.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h"
 
 namespace tensorflow_federated {
 namespace aggregation {

diff --git a/tensorflow_federated/cc/core/impl/aggregation/core/tensor_aggregator_registry_test.cc b/tensorflow_federated/cc/core/impl/aggregation/core/tensor_aggregator_registry_test.cc
@@ -25,7 +25,7 @@
 #include "tensorflow_federated/cc/core/impl/aggregation/core/intrinsic.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/core/tensor_aggregator.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/core/tensor_aggregator_factory.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h"
 
 namespace tensorflow_federated {
 namespace aggregation {

diff --git a/tensorflow_federated/cc/core/impl/aggregation/core/tensor_data_test.cc b/tensorflow_federated/cc/core/impl/aggregation/core/tensor_data_test.cc
@@ -21,7 +21,7 @@
 #include "googlemock/include/gmock/gmock.h"
 #include "googletest/include/gtest/gtest.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/base/monitoring.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h"
 
 namespace tensorflow_federated {
 namespace aggregation {

diff --git a/tensorflow_federated/cc/core/impl/aggregation/core/tensor_shape_test.cc b/tensorflow_federated/cc/core/impl/aggregation/core/tensor_shape_test.cc
@@ -22,7 +22,7 @@
 #include "googlemock/include/gmock/gmock.h"
 #include "googletest/include/gtest/gtest.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/base/monitoring.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h"
 
 namespace tensorflow_federated {
 namespace aggregation {

diff --git a/tensorflow_federated/cc/core/impl/aggregation/core/tensor_spec_test.cc b/tensorflow_federated/cc/core/impl/aggregation/core/tensor_spec_test.cc
@@ -19,8 +19,8 @@
 #include "googlemock/include/gmock/gmock.h"
 #include "googletest/include/gtest/gtest.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/core/tensor_shape.h"
-#include "tensorflow_federated/cc/core/impl/executors/protobuf_matchers.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/protobuf_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h"
 
 namespace tensorflow_federated {
 namespace aggregation {

diff --git a/tensorflow_federated/cc/core/impl/aggregation/core/tensor_test.cc b/tensorflow_federated/cc/core/impl/aggregation/core/tensor_test.cc
@@ -29,8 +29,8 @@
 #include "tensorflow_federated/cc/core/impl/aggregation/core/tensor_shape.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/test_data.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/testing.h"
-#include "tensorflow_federated/cc/core/impl/executors/protobuf_matchers.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/protobuf_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h"
 
 namespace tensorflow_federated {
 namespace aggregation {

diff --git a/tensorflow_federated/cc/core/impl/aggregation/core/vector_string_data_test.cc b/tensorflow_federated/cc/core/impl/aggregation/core/vector_string_data_test.cc
@@ -22,7 +22,7 @@
 #include "googlemock/include/gmock/gmock.h"
 #include "googletest/include/gtest/gtest.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/core/datatype.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h"
 
 namespace tensorflow_federated {
 namespace aggregation {

diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/BUILD b/tensorflow_federated/cc/core/impl/aggregation/protocol/BUILD
@@ -146,7 +146,7 @@ cc_test(
         "//tensorflow_federated/cc/core/impl/aggregation/testing:mocks",
         "//tensorflow_federated/cc/core/impl/aggregation/testing:parse_text_proto",
         "//tensorflow_federated/cc/core/impl/aggregation/testing:test_data",
-        "//tensorflow_federated/cc/core/impl/executors:status_matchers",
+        "//tensorflow_federated/cc/core/impl/testing:status_matchers",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/synchronization",
@@ -264,6 +264,6 @@ cc_test(
         "//tensorflow_federated/cc/core/impl/aggregation/testing",
         "//tensorflow_federated/cc/core/impl/aggregation/testing:parse_text_proto",
         "//tensorflow_federated/cc/core/impl/aggregation/testing:test_data",
-        "//tensorflow_federated/cc/core/impl/executors:status_matchers",
+        "//tensorflow_federated/cc/core/impl/testing:status_matchers",
     ],
 )
diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/checkpoint_aggregator_test.cc b/tensorflow_federated/cc/core/impl/aggregation/protocol/checkpoint_aggregator_test.cc
@@ -49,7 +49,7 @@
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/mocks.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/test_data.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/testing.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h"
 
 namespace tensorflow_federated {
 namespace aggregation {

diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter_test.cc b/tensorflow_federated/cc/core/impl/aggregation/protocol/config_converter_test.cc
@@ -35,7 +35,7 @@
 #include "tensorflow_federated/cc/core/impl/aggregation/protocol/configuration.pb.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/test_data.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/testing.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h"
 
 namespace tensorflow_federated {
 namespace aggregation {

diff --git a/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/BUILD b/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/BUILD
@@ -34,7 +34,7 @@ cc_test(
         ":latency_aggregator",
         "//tensorflow_federated/cc/common_libs:oss_test_main",
         "//tensorflow_federated/cc/core/impl/aggregation/base",
-        "//tensorflow_federated/cc/core/impl/executors:status_matchers",
+        "//tensorflow_federated/cc/core/impl/testing:status_matchers",
         "@com_google_absl//absl/time",
     ],
 )
@@ -115,8 +115,8 @@ cc_test(
         "//tensorflow_federated/cc/core/impl/aggregation/testing:mocks",
         "//tensorflow_federated/cc/core/impl/aggregation/testing:parse_text_proto",
         "//tensorflow_federated/cc/core/impl/aggregation/testing:test_data",
-        "//tensorflow_federated/cc/core/impl/executors:protobuf_matchers",
-        "//tensorflow_federated/cc/core/impl/executors:status_matchers",
+        "//tensorflow_federated/cc/core/impl/testing:protobuf_matchers",
+        "//tensorflow_federated/cc/core/impl/testing:status_matchers",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings:cord",

diff --git a/...federated/cc/core/impl/aggregation/protocol/simple_aggregation/latency_aggregator_test.cc b/...federated/cc/core/impl/aggregation/protocol/simple_aggregation/latency_aggregator_test.cc
@@ -20,7 +20,7 @@
 #include "googletest/include/gtest/gtest.h"
 #include "absl/time/time.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/base/monitoring.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h"
 
 namespace tensorflow_federated::aggregation {
 namespace {

diff --git a/.../cc/core/impl/aggregation/protocol/simple_aggregation/simple_aggregation_protocol_test.cc b/.../cc/core/impl/aggregation/protocol/simple_aggregation/simple_aggregation_protocol_test.cc
@@ -54,8 +54,8 @@
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/mocks.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/test_data.h"
 #include "tensorflow_federated/cc/core/impl/aggregation/testing/testing.h"
-#include "tensorflow_federated/cc/core/impl/executors/protobuf_matchers.h"
-#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/protobuf_matchers.h"
+#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h"
 
 namespace tensorflow_federated::aggregation {
 namespace {