From 98603fcf48bc15613c0ba0d484eb19d75ee99115 Mon Sep 17 00:00:00 2001 From: Michael Reneer Date: Mon, 13 May 2024 09:55:34 -0700 Subject: [PATCH] Move `protobuf_matchers` and `status_matchers` to a `testing` package and remove the dependency from the aggregators package to the executors package. PiperOrigin-RevId: 633243887 --- .../cc/core/impl/aggregation/BUILD | 7 ++ .../cc/core/impl/aggregation/core/BUILD | 32 ++--- .../core/agg_vector_aggregator_test.cc | 2 +- .../core/composite_key_combiner_test.cc | 2 +- .../core/dp_composite_key_combiner_test.cc | 2 +- .../core/dp_group_by_aggregator_test.cc | 2 +- .../core/dp_grouping_federated_sum_test.cc | 2 +- .../aggregation/core/federated_mean_test.cc | 2 +- .../aggregation/core/federated_sum_test.cc | 2 +- .../core/group_by_aggregator_test.cc | 2 +- .../core/grouping_federated_sum_test.cc | 2 +- .../core/mutable_string_data_test.cc | 2 +- .../core/mutable_vector_data_test.cc | 2 +- .../core/one_dim_grouping_aggregator_test.cc | 2 +- .../core/tensor_aggregator_registry_test.cc | 2 +- .../impl/aggregation/core/tensor_data_test.cc | 2 +- .../aggregation/core/tensor_shape_test.cc | 2 +- .../impl/aggregation/core/tensor_spec_test.cc | 4 +- .../core/impl/aggregation/core/tensor_test.cc | 4 +- .../core/vector_string_data_test.cc | 2 +- .../cc/core/impl/aggregation/protocol/BUILD | 4 +- .../protocol/checkpoint_aggregator_test.cc | 2 +- .../protocol/config_converter_test.cc | 2 +- .../protocol/simple_aggregation/BUILD | 6 +- .../latency_aggregator_test.cc | 2 +- .../simple_aggregation_protocol_test.cc | 4 +- .../cc/core/impl/aggregation/tensorflow/BUILD | 4 +- .../tensorflow/checkpoint_reader_test.cc | 2 +- .../aggregation/tensorflow/converters_test.cc | 2 +- .../cc/core/impl/aggregation/testing/BUILD | 2 +- .../core/impl/aggregation/testing/testing.h | 2 +- .../cc/core/impl/executor_stacks/BUILD | 4 +- .../impl/executor_stacks/local_stacks_test.cc | 2 +- .../executor_stacks/remote_stacks_test.cc | 2 +- .../cc/core/impl/executors/BUILD | 112 ++++++------------ .../impl/executors/composing_executor_test.cc | 2 +- .../core/impl/executors/data_executor_test.cc | 2 +- .../executors/dataset_conversions_test.cc | 4 +- .../dataset_from_tensor_structures_test.cc | 2 +- .../impl/executors/dtensor_executor_test.cc | 4 +- .../impl/executors/eager_computation_test.cc | 2 +- .../impl/executors/executor_service_test.cc | 4 +- .../core/impl/executors/executor_test_base.h | 4 +- .../executors/federating_executor_test.cc | 2 +- .../core/impl/executors/mock_data_backend.h | 2 +- .../cc/core/impl/executors/mock_executor.h | 2 +- .../reference_resolving_executor_test.cc | 4 +- .../impl/executors/remote_executor_test.cc | 4 +- .../impl/executors/sequence_executor_test.cc | 2 +- .../impl/executors/session_provider_test.cc | 2 +- .../streaming_remote_executor_test.cc | 4 +- .../executors/struct_traversal_order_test.cc | 2 +- .../tensorflow_executor_parameterized_test.cc | 4 +- .../impl/executors/tensorflow_utils_test.cc | 2 +- .../cc/core/impl/executors/threading_test.cc | 2 +- .../cc/core/impl/executors/value_test_utils.h | 2 +- .../impl/executors/value_validation_test.cc | 2 +- .../core/impl/executors/xla_executor_test.cc | 4 +- .../cc/core/impl/executors/xla_utils_test.cc | 2 +- .../cc/core/impl/testing/BUILD | 45 +++++++ .../protobuf_matchers.h | 0 .../{executors => testing}/status_matchers.cc | 3 +- .../{executors => testing}/status_matchers.h | 0 63 files changed, 178 insertions(+), 167 deletions(-) create mode 100644 tensorflow_federated/cc/core/impl/testing/BUILD rename tensorflow_federated/cc/core/impl/{executors => testing}/protobuf_matchers.h (100%) rename tensorflow_federated/cc/core/impl/{executors => testing}/status_matchers.cc (98%) rename tensorflow_federated/cc/core/impl/{executors => testing}/status_matchers.h (100%) diff --git a/tensorflow_federated/cc/core/impl/aggregation/BUILD b/tensorflow_federated/cc/core/impl/aggregation/BUILD index 85c85b070a..81d05082f6 100644 --- 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 index 41be7bc7b1..57828190a0 100644 --- 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 index 76e98be0df..231087fedb 100644 --- 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 index 963c582438..02f83d9fd1 100644 --- 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 index 9b8abd88e8..ba6981c061 100644 --- 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 index 103481d857..8c1bd7fbb5 100644 --- 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 index 24f9e658a2..ff4917b21a 100644 --- 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 index 57fa664a97..02819c5ccd 100644 --- 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 index e94fe339ce..a23e0038fc 100644 --- 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 index 28e31f466c..66a33fd735 100644 --- 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 index 94754783f0..46124e2d95 100644 --- 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 index c402ef6937..7c8e854900 100644 --- 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 index 0a0b173ded..70f3bb3d91 100644 --- 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 index 1510f02578..39c74d5c92 100644 --- 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 index 796d704514..37cd42585b 100644 --- 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 index 952334c465..8b70a9d98f 100644 --- 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 index 3b6afbb936..d28771c033 100644 --- 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 index 480ff91f26..2bfe83c051 100644 --- 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 index cf385b2bee..c898939827 100644 --- 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 index 29589dd62c..850ee9a93e 100644 --- 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 index 2c23d43364..8f0a38534a 100644 --- 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 index fac2cee94a..73e0c3d587 100644 --- 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 index 0faca61a6e..f64b487c4b 100644 --- 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 index 71bb1a605d..98ae159f73 100644 --- 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/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/latency_aggregator_test.cc b/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/latency_aggregator_test.cc index bc50c629dd..ceae76abd1 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/latency_aggregator_test.cc +++ b/tensorflow_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/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/simple_aggregation_protocol_test.cc b/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/simple_aggregation_protocol_test.cc index b675a5e147..2d5f38411f 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/protocol/simple_aggregation/simple_aggregation_protocol_test.cc +++ b/tensorflow_federated/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 { diff --git a/tensorflow_federated/cc/core/impl/aggregation/tensorflow/BUILD b/tensorflow_federated/cc/core/impl/aggregation/tensorflow/BUILD index 974070561f..e87f1c7243 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/tensorflow/BUILD +++ b/tensorflow_federated/cc/core/impl/aggregation/tensorflow/BUILD @@ -48,7 +48,7 @@ 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", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings:string_view", "@org_tensorflow//tensorflow/core:framework", @@ -86,7 +86,7 @@ cc_test( "//tensorflow_federated/cc/core/impl/aggregation/base", "//tensorflow_federated/cc/core/impl/aggregation/core:tensor", "//tensorflow_federated/cc/core/impl/aggregation/testing", - "//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/tensorflow/checkpoint_reader_test.cc b/tensorflow_federated/cc/core/impl/aggregation/tensorflow/checkpoint_reader_test.cc index 42f38f6680..f6108199c3 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/tensorflow/checkpoint_reader_test.cc +++ b/tensorflow_federated/cc/core/impl/aggregation/tensorflow/checkpoint_reader_test.cc @@ -26,7 +26,7 @@ #include "tensorflow_federated/cc/core/impl/aggregation/base/platform.h" #include "tensorflow_federated/cc/core/impl/aggregation/core/datatype.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::aggregation::tensorflow { namespace { diff --git a/tensorflow_federated/cc/core/impl/aggregation/tensorflow/converters_test.cc b/tensorflow_federated/cc/core/impl/aggregation/tensorflow/converters_test.cc index 6eba7b49b4..e92bebbb11 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/tensorflow/converters_test.cc +++ b/tensorflow_federated/cc/core/impl/aggregation/tensorflow/converters_test.cc @@ -43,7 +43,7 @@ #include "tensorflow_federated/cc/core/impl/aggregation/core/vector_string_data.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::aggregation::tensorflow { namespace { diff --git a/tensorflow_federated/cc/core/impl/aggregation/testing/BUILD b/tensorflow_federated/cc/core/impl/aggregation/testing/BUILD index 4523305dff..b799c75f9b 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/testing/BUILD +++ b/tensorflow_federated/cc/core/impl/aggregation/testing/BUILD @@ -27,7 +27,7 @@ cc_library( "//tensorflow_federated/cc/core/impl/aggregation/base", "//tensorflow_federated/cc/core/impl/aggregation/core:intrinsic", "//tensorflow_federated/cc/core/impl/aggregation/core:tensor", - "//tensorflow_federated/cc/core/impl/executors:status_matchers", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/memory", "@com_google_absl//absl/status", diff --git a/tensorflow_federated/cc/core/impl/aggregation/testing/testing.h b/tensorflow_federated/cc/core/impl/aggregation/testing/testing.h index 57b65d2e0a..7f2aaa6ea8 100644 --- a/tensorflow_federated/cc/core/impl/aggregation/testing/testing.h +++ b/tensorflow_federated/cc/core/impl/aggregation/testing/testing.h @@ -43,7 +43,7 @@ #include "tensorflow_federated/cc/core/impl/aggregation/core/tensor.h" #include "tensorflow_federated/cc/core/impl/aggregation/core/tensor_shape.h" // clang-format off -#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" +#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h" // clang-format on namespace tensorflow_federated::aggregation { diff --git a/tensorflow_federated/cc/core/impl/executor_stacks/BUILD b/tensorflow_federated/cc/core/impl/executor_stacks/BUILD index f84aef30d2..80c409fe2a 100644 --- a/tensorflow_federated/cc/core/impl/executor_stacks/BUILD +++ b/tensorflow_federated/cc/core/impl/executor_stacks/BUILD @@ -58,7 +58,7 @@ cc_test( "//tensorflow_federated/cc/core/impl/executors:cardinalities", "//tensorflow_federated/cc/core/impl/executors:executor", "//tensorflow_federated/cc/core/impl/executors:mock_executor", - "//tensorflow_federated/cc/core/impl/executors:status_matchers", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "@com_google_absl//absl/status:statusor", ], ) @@ -96,7 +96,7 @@ cc_test( "//tensorflow_federated/cc/core/impl/executors:composing_executor", "//tensorflow_federated/cc/core/impl/executors:executor", "//tensorflow_federated/cc/core/impl/executors:mock_executor", - "//tensorflow_federated/cc/core/impl/executors:status_matchers", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "@com_github_grpc_grpc//:gpr", "@com_github_grpc_grpc//:grpc++", "@com_google_absl//absl/status", diff --git a/tensorflow_federated/cc/core/impl/executor_stacks/local_stacks_test.cc b/tensorflow_federated/cc/core/impl/executor_stacks/local_stacks_test.cc index e4a133c5b6..ad763d70f3 100644 --- a/tensorflow_federated/cc/core/impl/executor_stacks/local_stacks_test.cc +++ b/tensorflow_federated/cc/core/impl/executor_stacks/local_stacks_test.cc @@ -25,7 +25,7 @@ limitations under the License #include "tensorflow_federated/cc/core/impl/executors/cardinalities.h" #include "tensorflow_federated/cc/core/impl/executors/executor.h" #include "tensorflow_federated/cc/core/impl/executors/mock_executor.h" -#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" +#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h" using testing::MockFunction; using testing::Return; diff --git a/tensorflow_federated/cc/core/impl/executor_stacks/remote_stacks_test.cc b/tensorflow_federated/cc/core/impl/executor_stacks/remote_stacks_test.cc index e2b7caa372..a68375e45c 100644 --- a/tensorflow_federated/cc/core/impl/executor_stacks/remote_stacks_test.cc +++ b/tensorflow_federated/cc/core/impl/executor_stacks/remote_stacks_test.cc @@ -31,7 +31,7 @@ limitations under the License #include "tensorflow_federated/cc/core/impl/executors/composing_executor.h" #include "tensorflow_federated/cc/core/impl/executors/executor.h" #include "tensorflow_federated/cc/core/impl/executors/mock_executor.h" -#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" +#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h" using absl::StatusCode; using ::testing::AnyOfArray; diff --git a/tensorflow_federated/cc/core/impl/executors/BUILD b/tensorflow_federated/cc/core/impl/executors/BUILD index 9e2d450622..5f2f180898 100644 --- a/tensorflow_federated/cc/core/impl/executors/BUILD +++ b/tensorflow_federated/cc/core/impl/executors/BUILD @@ -90,10 +90,10 @@ cc_test( ":executor", ":executor_test_base", ":mock_executor", - ":status_matchers", ":type_utils", ":value_test_utils", "//tensorflow_federated/cc/common_libs:oss_test_main", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "//tensorflow_federated/proto/v0:computation_cc_proto", "//tensorflow_federated/proto/v0:data_type_cc_proto", "//tensorflow_federated/proto/v0:executor_cc_proto", @@ -145,9 +145,9 @@ cc_test( ":executor_test_base", ":mock_data_backend", ":mock_executor", - ":status_matchers", ":value_test_utils", "//tensorflow_federated/cc/common_libs:oss_test_main", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "//tensorflow_federated/proto/v0:computation_cc_proto", "//tensorflow_federated/proto/v0:data_type_cc_proto", "//tensorflow_federated/proto/v0:executor_cc_proto", @@ -172,10 +172,10 @@ cc_test( srcs = ["dataset_conversions_test.cc"], deps = [ ":dataset_conversions", - ":protobuf_matchers", - ":status_matchers", ":value_test_utils", "//tensorflow_federated/cc/common_libs:oss_test_main", + "//tensorflow_federated/cc/core/impl/testing:protobuf_matchers", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "@com_google_absl//absl/status", "@org_tensorflow//tensorflow/cc:cc_ops", "@org_tensorflow//tensorflow/core:framework", @@ -218,9 +218,9 @@ cc_test( deps = [ ":dataset_from_tensor_structures", ":session_provider", - ":status_matchers", ":value_test_utils", "//tensorflow_federated/cc/common_libs:oss_test_main", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "@com_google_absl//absl/flags:flag", "@com_google_absl//absl/log:check", "@com_google_absl//absl/status", @@ -315,10 +315,10 @@ cc_test( ":dtensor_api", ":dtensor_executor", ":executor", - ":protobuf_matchers", - ":status_matchers", ":value_test_utils", "//tensorflow_federated/cc/common_libs:oss_test_main", + "//tensorflow_federated/cc/core/impl/testing:protobuf_matchers", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "@com_google_absl//absl/log", "@com_google_absl//absl/log:check", "@com_google_absl//absl/strings", @@ -383,8 +383,8 @@ tff_cc_cpu_gpu_test( deps = [ ":dtensor_api", ":eager_computation", - ":status_matchers", "//tensorflow_federated/cc/common_libs:oss_test_main", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "@com_google_absl//absl/log:check", "@com_google_absl//absl/status", "@com_google_absl//absl/strings", @@ -503,11 +503,11 @@ cc_test( ":executor", ":executor_service", ":mock_executor", - ":protobuf_matchers", ":status_conversion", - ":status_matchers", ":value_test_utils", "//tensorflow_federated/cc/common_libs:oss_test_main", + "//tensorflow_federated/cc/core/impl/testing:protobuf_matchers", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "//tensorflow_federated/proto/v0:computation_cc_proto", "//tensorflow_federated/proto/v0:executor_cc_proto", "@com_github_grpc_grpc//:grpc++", @@ -524,8 +524,8 @@ cc_library( hdrs = ["executor_test_base.h"], deps = [ ":executor", - ":protobuf_matchers", - ":status_matchers", + "//tensorflow_federated/cc/core/impl/testing:protobuf_matchers", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "//tensorflow_federated/proto/v0:executor_cc_proto", "@com_google_googletest//:gtest", ], @@ -590,9 +590,9 @@ cc_test( ":federating_executor", ":mock_executor", ":status_macros", - ":status_matchers", ":value_test_utils", "//tensorflow_federated/cc/common_libs:oss_test_main", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "//tensorflow_federated/proto/v0:executor_cc_proto", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", @@ -642,7 +642,7 @@ cc_library( hdrs = ["mock_data_backend.h"], deps = [ ":data_backend", - ":protobuf_matchers", + "//tensorflow_federated/cc/core/impl/testing:protobuf_matchers", "//tensorflow_federated/proto/v0:computation_cc_proto", "//tensorflow_federated/proto/v0:executor_cc_proto", "@com_google_absl//absl/status", @@ -657,7 +657,7 @@ cc_library( hdrs = ["mock_executor.h"], deps = [ ":executor", - ":protobuf_matchers", + "//tensorflow_federated/cc/core/impl/testing:protobuf_matchers", "//tensorflow_federated/proto/v0:executor_cc_proto", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", @@ -680,26 +680,6 @@ cc_library( ], ) -cc_library( - name = "protobuf_matchers", - testonly = True, - hdrs = ["protobuf_matchers.h"], - # TODO: b/337290794 - Temporarily add `aggregation` package to the visibility of test utilities - # located in the `executor` package. - visibility = [ - ":executors_packages", - "//tensorflow_federated/cc/core/impl:impl_users", - "//tensorflow_federated/cc/core/impl/aggregation:__subpackages__", - "//tensorflow_federated/cc/core/impl/executor_stacks:executor_stacks_packages", - ], - deps = [ - "@com_google_absl//absl/memory", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_googletest//:gtest", - ], -) - cc_library( name = "reference_resolving_executor", srcs = ["reference_resolving_executor.cc"], @@ -726,11 +706,11 @@ cc_test( ":executor", ":executor_test_base", ":mock_executor", - ":protobuf_matchers", ":reference_resolving_executor", - ":status_matchers", ":value_test_utils", "//tensorflow_federated/cc/common_libs:oss_test_main", + "//tensorflow_federated/cc/core/impl/testing:protobuf_matchers", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "//tensorflow_federated/proto/v0:computation_cc_proto", "//tensorflow_federated/proto/v0:data_type_cc_proto", "//tensorflow_federated/proto/v0:executor_cc_proto", @@ -779,11 +759,11 @@ cc_test( ":cardinalities", ":executor", ":mock_grpc", - ":protobuf_matchers", ":remote_executor", - ":status_matchers", ":value_test_utils", "//tensorflow_federated/cc/common_libs:oss_test_main", + "//tensorflow_federated/cc/core/impl/testing:protobuf_matchers", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "//tensorflow_federated/proto/v0:executor_cc_grpc_proto", "//tensorflow_federated/proto/v0:executor_cc_proto", "@com_github_grpc_grpc//:grpc++", @@ -834,9 +814,9 @@ cc_test( ":mock_executor", ":sequence_executor", ":sequence_intrinsics", - ":status_matchers", ":value_test_utils", "//tensorflow_federated/cc/common_libs:oss_test_main", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "//tensorflow_federated/proto/v0:computation_cc_proto", "@com_google_absl//absl/status", "@org_tensorflow//tensorflow/core:portable_gif_internal", @@ -882,8 +862,8 @@ cc_test( srcs = ["session_provider_test.cc"], deps = [ ":session_provider", - ":status_matchers", "//tensorflow_federated/cc/common_libs:oss_test_main", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "@org_tensorflow//tensorflow/core:tensorflow", ], ) @@ -908,28 +888,6 @@ cc_library( ], ) -cc_library( - name = "status_matchers", - testonly = True, - srcs = ["status_matchers.cc"], - hdrs = ["status_matchers.h"], - # TODO: b/337290794 - Temporarily add `aggregation` package to the visibility of test utilities - # located in the `executor` package. - visibility = [ - ":executors_packages", - "//tensorflow_federated/cc/core/impl:impl_users", - "//tensorflow_federated/cc/core/impl/aggregation:__subpackages__", - "//tensorflow_federated/cc/core/impl/executor_stacks:executor_stacks_packages", - ], - deps = [ - "@com_github_grpc_grpc//:grpc++", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", - "@com_google_googletest//:gtest", - ], -) - cc_library( name = "streaming_remote_executor", srcs = ["streaming_remote_executor.cc"], @@ -964,12 +922,12 @@ cc_test( ":executor", ":federated_intrinsics", ":mock_grpc", - ":protobuf_matchers", - ":status_matchers", ":streaming_remote_executor", ":type_utils", ":value_test_utils", "//tensorflow_federated/cc/common_libs:oss_test_main", + "//tensorflow_federated/cc/core/impl/testing:protobuf_matchers", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "//tensorflow_federated/proto/v0:computation_cc_proto", "//tensorflow_federated/proto/v0:data_type_cc_proto", "//tensorflow_federated/proto/v0:executor_cc_grpc_proto", @@ -1004,9 +962,9 @@ cc_test( name = "struct_traversal_order_test", srcs = ["struct_traversal_order_test.cc"], deps = [ - ":status_matchers", ":struct_traversal_order", "//tensorflow_federated/cc/common_libs:oss_test_main", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", ], @@ -1073,12 +1031,12 @@ tff_cc_cpu_gpu_test( ":array_test_utils", ":dtensor_executor", ":executor", - ":protobuf_matchers", ":status_macros", - ":status_matchers", ":tensorflow_executor", ":value_test_utils", "//tensorflow_federated/cc/common_libs:oss_test_main", + "//tensorflow_federated/cc/core/impl/testing:protobuf_matchers", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "//tensorflow_federated/proto/v0:array_cc_proto", "//tensorflow_federated/proto/v0:computation_cc_proto", "//tensorflow_federated/proto/v0:data_type_cc_proto", @@ -1126,9 +1084,9 @@ cc_test( deps = [ ":array_shape_test_utils", ":array_test_utils", - ":status_matchers", ":tensorflow_utils", "//tensorflow_federated/cc/common_libs:oss_test_main", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "//tensorflow_federated/proto/v0:array_cc_proto", "//tensorflow_federated/proto/v0:computation_cc_proto", "@com_google_absl//absl/status", @@ -1161,9 +1119,9 @@ cc_test( timeout = "short", srcs = ["threading_test.cc"], deps = [ - ":status_matchers", ":threading", "//tensorflow_federated/cc/common_libs:oss_test_main", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/status", "@com_google_absl//absl/synchronization", @@ -1205,8 +1163,8 @@ cc_library( deps = [ ":cardinalities", ":dataset_conversions", - ":protobuf_matchers", ":status_macros", + "//tensorflow_federated/cc/core/impl/testing:protobuf_matchers", "//tensorflow_federated/proto/v0:array_cc_proto", "//tensorflow_federated/proto/v0:computation_cc_proto", "//tensorflow_federated/proto/v0:data_type_cc_proto", @@ -1249,10 +1207,10 @@ cc_test( timeout = "short", srcs = ["value_validation_test.cc"], deps = [ - ":status_matchers", ":value_test_utils", ":value_validation", "//tensorflow_federated/cc/common_libs:oss_test_main", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "//tensorflow_federated/proto/v0:computation_cc_proto", "//tensorflow_federated/proto/v0:executor_cc_proto", "@com_google_absl//absl/status", @@ -1303,13 +1261,13 @@ tff_cc_cpu_gpu_test( ":array_shape_test_utils", ":array_test_utils", ":executor", - ":protobuf_matchers", ":status_macros", - ":status_matchers", ":type_test_utils", ":value_test_utils", ":xla_executor", "//tensorflow_federated/cc/common_libs:oss_test_main", + "//tensorflow_federated/cc/core/impl/testing:protobuf_matchers", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "//tensorflow_federated/proto/v0:array_cc_proto", "//tensorflow_federated/proto/v0:computation_cc_proto", "//tensorflow_federated/proto/v0:data_type_cc_proto", @@ -1340,13 +1298,13 @@ cc_test( ":array_shape_test_utils", ":array_test_utils", ":executor", - ":protobuf_matchers", ":status_macros", - ":status_matchers", ":type_test_utils", ":value_test_utils", ":xla_executor", "//tensorflow_federated/cc/common_libs:oss_test_main", + "//tensorflow_federated/cc/core/impl/testing:protobuf_matchers", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "//tensorflow_federated/proto/v0:array_cc_proto", "//tensorflow_federated/proto/v0:computation_cc_proto", "//tensorflow_federated/proto/v0:data_type_cc_proto", @@ -1394,9 +1352,9 @@ cc_test( deps = [ ":array_shape_test_utils", ":array_test_utils", - ":status_matchers", ":xla_utils", "//tensorflow_federated/cc/common_libs:oss_test_main", + "//tensorflow_federated/cc/core/impl/testing:status_matchers", "//tensorflow_federated/proto/v0:array_cc_proto", "//tensorflow_federated/proto/v0:computation_cc_proto", "//tensorflow_federated/proto/v0:data_type_cc_proto", diff --git a/tensorflow_federated/cc/core/impl/executors/composing_executor_test.cc b/tensorflow_federated/cc/core/impl/executors/composing_executor_test.cc index d598771bac..bc2051fcd3 100644 --- a/tensorflow_federated/cc/core/impl/executors/composing_executor_test.cc +++ b/tensorflow_federated/cc/core/impl/executors/composing_executor_test.cc @@ -31,9 +31,9 @@ limitations under the License #include "tensorflow_federated/cc/core/impl/executors/executor.h" #include "tensorflow_federated/cc/core/impl/executors/executor_test_base.h" #include "tensorflow_federated/cc/core/impl/executors/mock_executor.h" -#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" #include "tensorflow_federated/cc/core/impl/executors/type_utils.h" #include "tensorflow_federated/cc/core/impl/executors/value_test_utils.h" +#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h" #include "tensorflow_federated/proto/v0/computation.pb.h" #include "tensorflow_federated/proto/v0/data_type.pb.h" #include "tensorflow_federated/proto/v0/executor.pb.h" diff --git a/tensorflow_federated/cc/core/impl/executors/data_executor_test.cc b/tensorflow_federated/cc/core/impl/executors/data_executor_test.cc index b6d9fac6a4..6bad8bb8a4 100644 --- a/tensorflow_federated/cc/core/impl/executors/data_executor_test.cc +++ b/tensorflow_federated/cc/core/impl/executors/data_executor_test.cc @@ -26,8 +26,8 @@ limitations under the License #include "tensorflow_federated/cc/core/impl/executors/executor_test_base.h" #include "tensorflow_federated/cc/core/impl/executors/mock_data_backend.h" #include "tensorflow_federated/cc/core/impl/executors/mock_executor.h" -#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" #include "tensorflow_federated/cc/core/impl/executors/value_test_utils.h" +#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h" #include "tensorflow_federated/proto/v0/computation.pb.h" #include "tensorflow_federated/proto/v0/data_type.pb.h" #include "tensorflow_federated/proto/v0/executor.pb.h" diff --git a/tensorflow_federated/cc/core/impl/executors/dataset_conversions_test.cc b/tensorflow_federated/cc/core/impl/executors/dataset_conversions_test.cc index 1ee4b30044..a3274d36ab 100644 --- a/tensorflow_federated/cc/core/impl/executors/dataset_conversions_test.cc +++ b/tensorflow_federated/cc/core/impl/executors/dataset_conversions_test.cc @@ -27,9 +27,9 @@ limitations under the License #include "tensorflow/core/framework/tensor.h" #include "tensorflow/core/framework/types.pb.h" #include "tensorflow/core/platform/tstring.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/executors/value_test_utils.h" +#include "tensorflow_federated/cc/core/impl/testing/protobuf_matchers.h" +#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h" namespace tensorflow_federated { diff --git a/tensorflow_federated/cc/core/impl/executors/dataset_from_tensor_structures_test.cc b/tensorflow_federated/cc/core/impl/executors/dataset_from_tensor_structures_test.cc index 4818592217..4ed70c9bc1 100644 --- a/tensorflow_federated/cc/core/impl/executors/dataset_from_tensor_structures_test.cc +++ b/tensorflow_federated/cc/core/impl/executors/dataset_from_tensor_structures_test.cc @@ -34,8 +34,8 @@ limitations under the License #include "tensorflow/core/platform/status.h" #include "tensorflow/core/platform/tstring.h" #include "tensorflow_federated/cc/core/impl/executors/session_provider.h" -#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" #include "tensorflow_federated/cc/core/impl/executors/value_test_utils.h" +#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h" ABSL_FLAG(std::string, reduce_graph_path, "", "Path to a serialized GraphDef containing a dataset reduce."); diff --git a/tensorflow_federated/cc/core/impl/executors/dtensor_executor_test.cc b/tensorflow_federated/cc/core/impl/executors/dtensor_executor_test.cc index 92931412f5..4b629b0887 100644 --- a/tensorflow_federated/cc/core/impl/executors/dtensor_executor_test.cc +++ b/tensorflow_federated/cc/core/impl/executors/dtensor_executor_test.cc @@ -50,9 +50,9 @@ limitations under the License #include "tensorflow/dtensor/proto/layout.pb.h" #include "tensorflow_federated/cc/core/impl/executors/dtensor_api.h" #include "tensorflow_federated/cc/core/impl/executors/executor.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/executors/value_test_utils.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 { diff --git a/tensorflow_federated/cc/core/impl/executors/eager_computation_test.cc b/tensorflow_federated/cc/core/impl/executors/eager_computation_test.cc index da1138ca74..abf5064c40 100644 --- a/tensorflow_federated/cc/core/impl/executors/eager_computation_test.cc +++ b/tensorflow_federated/cc/core/impl/executors/eager_computation_test.cc @@ -53,7 +53,7 @@ limitations under the License #include "tensorflow/dtensor/cc/mesh_type.h" #include "tensorflow/dtensor/cc/tensor_layout.h" #include "tensorflow_federated/cc/core/impl/executors/dtensor_api.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 { diff --git a/tensorflow_federated/cc/core/impl/executors/executor_service_test.cc b/tensorflow_federated/cc/core/impl/executors/executor_service_test.cc index 083cdf6921..69e228940b 100644 --- a/tensorflow_federated/cc/core/impl/executors/executor_service_test.cc +++ b/tensorflow_federated/cc/core/impl/executors/executor_service_test.cc @@ -33,10 +33,10 @@ limitations under the License #include "tensorflow_federated/cc/core/impl/executors/cardinalities.h" #include "tensorflow_federated/cc/core/impl/executors/executor.h" #include "tensorflow_federated/cc/core/impl/executors/mock_executor.h" -#include "tensorflow_federated/cc/core/impl/executors/protobuf_matchers.h" #include "tensorflow_federated/cc/core/impl/executors/status_conversion.h" -#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" #include "tensorflow_federated/cc/core/impl/executors/value_test_utils.h" +#include "tensorflow_federated/cc/core/impl/testing/protobuf_matchers.h" +#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h" #include "tensorflow_federated/proto/v0/computation.pb.h" #include "tensorflow_federated/proto/v0/executor.pb.h" diff --git a/tensorflow_federated/cc/core/impl/executors/executor_test_base.h b/tensorflow_federated/cc/core/impl/executors/executor_test_base.h index 6303b60052..beb0f015ff 100644 --- a/tensorflow_federated/cc/core/impl/executors/executor_test_base.h +++ b/tensorflow_federated/cc/core/impl/executors/executor_test_base.h @@ -21,8 +21,8 @@ limitations under the License #include "googlemock/include/gmock/gmock.h" #include "googletest/include/gtest/gtest.h" #include "tensorflow_federated/cc/core/impl/executors/executor.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" #include "tensorflow_federated/proto/v0/executor.pb.h" namespace tensorflow_federated { diff --git a/tensorflow_federated/cc/core/impl/executors/federating_executor_test.cc b/tensorflow_federated/cc/core/impl/executors/federating_executor_test.cc index fc9b5d9781..07ac1c41f4 100644 --- a/tensorflow_federated/cc/core/impl/executors/federating_executor_test.cc +++ b/tensorflow_federated/cc/core/impl/executors/federating_executor_test.cc @@ -33,8 +33,8 @@ limitations under the License #include "tensorflow_federated/cc/core/impl/executors/executor_test_base.h" #include "tensorflow_federated/cc/core/impl/executors/mock_executor.h" #include "tensorflow_federated/cc/core/impl/executors/status_macros.h" -#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" #include "tensorflow_federated/cc/core/impl/executors/value_test_utils.h" +#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h" #include "tensorflow_federated/proto/v0/executor.pb.h" namespace tensorflow_federated { diff --git a/tensorflow_federated/cc/core/impl/executors/mock_data_backend.h b/tensorflow_federated/cc/core/impl/executors/mock_data_backend.h index f91123a9aa..b1bb8eb3ff 100644 --- a/tensorflow_federated/cc/core/impl/executors/mock_data_backend.h +++ b/tensorflow_federated/cc/core/impl/executors/mock_data_backend.h @@ -22,7 +22,7 @@ limitations under the License #include "googlemock/include/gmock/gmock.h" #include "absl/status/status.h" #include "tensorflow_federated/cc/core/impl/executors/data_backend.h" -#include "tensorflow_federated/cc/core/impl/executors/protobuf_matchers.h" +#include "tensorflow_federated/cc/core/impl/testing/protobuf_matchers.h" #include "tensorflow_federated/proto/v0/computation.pb.h" #include "tensorflow_federated/proto/v0/executor.pb.h" diff --git a/tensorflow_federated/cc/core/impl/executors/mock_executor.h b/tensorflow_federated/cc/core/impl/executors/mock_executor.h index 743eca0840..09e87e965b 100644 --- a/tensorflow_federated/cc/core/impl/executors/mock_executor.h +++ b/tensorflow_federated/cc/core/impl/executors/mock_executor.h @@ -27,7 +27,7 @@ limitations under the License #include "absl/status/statusor.h" #include "absl/types/span.h" #include "tensorflow_federated/cc/core/impl/executors/executor.h" -#include "tensorflow_federated/cc/core/impl/executors/protobuf_matchers.h" +#include "tensorflow_federated/cc/core/impl/testing/protobuf_matchers.h" #include "tensorflow_federated/proto/v0/executor.pb.h" namespace tensorflow_federated { diff --git a/tensorflow_federated/cc/core/impl/executors/reference_resolving_executor_test.cc b/tensorflow_federated/cc/core/impl/executors/reference_resolving_executor_test.cc index a25037a052..6297dfaac7 100644 --- a/tensorflow_federated/cc/core/impl/executors/reference_resolving_executor_test.cc +++ b/tensorflow_federated/cc/core/impl/executors/reference_resolving_executor_test.cc @@ -52,9 +52,9 @@ limitations under the License #include "tensorflow_federated/cc/core/impl/executors/executor.h" #include "tensorflow_federated/cc/core/impl/executors/executor_test_base.h" #include "tensorflow_federated/cc/core/impl/executors/mock_executor.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/executors/value_test_utils.h" +#include "tensorflow_federated/cc/core/impl/testing/protobuf_matchers.h" +#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h" #include "tensorflow_federated/proto/v0/computation.pb.h" #include "tensorflow_federated/proto/v0/data_type.pb.h" #include "tensorflow_federated/proto/v0/executor.pb.h" diff --git a/tensorflow_federated/cc/core/impl/executors/remote_executor_test.cc b/tensorflow_federated/cc/core/impl/executors/remote_executor_test.cc index 5b0c474eda..a81ffa99cc 100644 --- a/tensorflow_federated/cc/core/impl/executors/remote_executor_test.cc +++ b/tensorflow_federated/cc/core/impl/executors/remote_executor_test.cc @@ -38,9 +38,9 @@ limitations under the License #include "tensorflow_federated/cc/core/impl/executors/cardinalities.h" #include "tensorflow_federated/cc/core/impl/executors/executor.h" #include "tensorflow_federated/cc/core/impl/executors/mock_grpc.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/executors/value_test_utils.h" +#include "tensorflow_federated/cc/core/impl/testing/protobuf_matchers.h" +#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h" #include "tensorflow_federated/proto/v0/executor.grpc.pb.h" #include "tensorflow_federated/proto/v0/executor.pb.h" diff --git a/tensorflow_federated/cc/core/impl/executors/sequence_executor_test.cc b/tensorflow_federated/cc/core/impl/executors/sequence_executor_test.cc index 24dc637917..6d7129e459 100644 --- a/tensorflow_federated/cc/core/impl/executors/sequence_executor_test.cc +++ b/tensorflow_federated/cc/core/impl/executors/sequence_executor_test.cc @@ -28,8 +28,8 @@ limitations under the License #include "tensorflow_federated/cc/core/impl/executors/executor_test_base.h" #include "tensorflow_federated/cc/core/impl/executors/mock_executor.h" #include "tensorflow_federated/cc/core/impl/executors/sequence_intrinsics.h" -#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" #include "tensorflow_federated/cc/core/impl/executors/value_test_utils.h" +#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h" #include "tensorflow_federated/proto/v0/computation.pb.h" namespace tensorflow_federated { diff --git a/tensorflow_federated/cc/core/impl/executors/session_provider_test.cc b/tensorflow_federated/cc/core/impl/executors/session_provider_test.cc index 7d92274914..e7ed51934a 100644 --- a/tensorflow_federated/cc/core/impl/executors/session_provider_test.cc +++ b/tensorflow_federated/cc/core/impl/executors/session_provider_test.cc @@ -18,7 +18,7 @@ limitations under the License #include #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 { diff --git a/tensorflow_federated/cc/core/impl/executors/streaming_remote_executor_test.cc b/tensorflow_federated/cc/core/impl/executors/streaming_remote_executor_test.cc index 80f3ad033d..b561d06cac 100644 --- a/tensorflow_federated/cc/core/impl/executors/streaming_remote_executor_test.cc +++ b/tensorflow_federated/cc/core/impl/executors/streaming_remote_executor_test.cc @@ -43,10 +43,10 @@ limitations under the License #include "tensorflow_federated/cc/core/impl/executors/executor.h" #include "tensorflow_federated/cc/core/impl/executors/federated_intrinsics.h" #include "tensorflow_federated/cc/core/impl/executors/mock_grpc.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/executors/type_utils.h" #include "tensorflow_federated/cc/core/impl/executors/value_test_utils.h" +#include "tensorflow_federated/cc/core/impl/testing/protobuf_matchers.h" +#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h" #include "tensorflow_federated/proto/v0/computation.pb.h" #include "tensorflow_federated/proto/v0/data_type.pb.h" #include "tensorflow_federated/proto/v0/executor.grpc.pb.h" diff --git a/tensorflow_federated/cc/core/impl/executors/struct_traversal_order_test.cc b/tensorflow_federated/cc/core/impl/executors/struct_traversal_order_test.cc index 8bbf43d830..7dfb1669f9 100644 --- a/tensorflow_federated/cc/core/impl/executors/struct_traversal_order_test.cc +++ b/tensorflow_federated/cc/core/impl/executors/struct_traversal_order_test.cc @@ -22,7 +22,7 @@ limitations under the License #include "googletest/include/gtest/gtest.h" #include "absl/status/status.h" #include "absl/status/statusor.h" -#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" +#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h" namespace tensorflow_federated { diff --git a/tensorflow_federated/cc/core/impl/executors/tensorflow_executor_parameterized_test.cc b/tensorflow_federated/cc/core/impl/executors/tensorflow_executor_parameterized_test.cc index 74e8bd72e2..1ef16c9217 100644 --- a/tensorflow_federated/cc/core/impl/executors/tensorflow_executor_parameterized_test.cc +++ b/tensorflow_federated/cc/core/impl/executors/tensorflow_executor_parameterized_test.cc @@ -49,11 +49,11 @@ limitations under the License #include "tensorflow_federated/cc/core/impl/executors/array_test_utils.h" #include "tensorflow_federated/cc/core/impl/executors/dtensor_executor.h" #include "tensorflow_federated/cc/core/impl/executors/executor.h" -#include "tensorflow_federated/cc/core/impl/executors/protobuf_matchers.h" #include "tensorflow_federated/cc/core/impl/executors/status_macros.h" -#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" #include "tensorflow_federated/cc/core/impl/executors/tensorflow_executor.h" #include "tensorflow_federated/cc/core/impl/executors/value_test_utils.h" +#include "tensorflow_federated/cc/core/impl/testing/protobuf_matchers.h" +#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h" #include "tensorflow_federated/proto/v0/array.pb.h" #include "tensorflow_federated/proto/v0/computation.pb.h" #include "tensorflow_federated/proto/v0/data_type.pb.h" diff --git a/tensorflow_federated/cc/core/impl/executors/tensorflow_utils_test.cc b/tensorflow_federated/cc/core/impl/executors/tensorflow_utils_test.cc index 0c94465168..bfdeda9803 100644 --- a/tensorflow_federated/cc/core/impl/executors/tensorflow_utils_test.cc +++ b/tensorflow_federated/cc/core/impl/executors/tensorflow_utils_test.cc @@ -29,7 +29,7 @@ limitations under the License #include "tensorflow/core/platform/tstring.h" #include "tensorflow_federated/cc/core/impl/executors/array_shape_test_utils.h" #include "tensorflow_federated/cc/core/impl/executors/array_test_utils.h" -#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" +#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h" #include "tensorflow_federated/proto/v0/array.pb.h" #include "tensorflow_federated/proto/v0/computation.pb.h" diff --git a/tensorflow_federated/cc/core/impl/executors/threading_test.cc b/tensorflow_federated/cc/core/impl/executors/threading_test.cc index 8e77d4517a..09ddbef200 100644 --- a/tensorflow_federated/cc/core/impl/executors/threading_test.cc +++ b/tensorflow_federated/cc/core/impl/executors/threading_test.cc @@ -28,7 +28,7 @@ limitations under the License #include "absl/synchronization/notification.h" #include "absl/time/clock.h" #include "absl/time/time.h" -#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" +#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h" namespace tensorflow_federated { diff --git a/tensorflow_federated/cc/core/impl/executors/value_test_utils.h b/tensorflow_federated/cc/core/impl/executors/value_test_utils.h index be1116990d..a838ca852d 100644 --- a/tensorflow_federated/cc/core/impl/executors/value_test_utils.h +++ b/tensorflow_federated/cc/core/impl/executors/value_test_utils.h @@ -46,8 +46,8 @@ limitations under the License #include "tensorflow/core/platform/tstring.h" #include "tensorflow_federated/cc/core/impl/executors/cardinalities.h" #include "tensorflow_federated/cc/core/impl/executors/dataset_conversions.h" -#include "tensorflow_federated/cc/core/impl/executors/protobuf_matchers.h" #include "tensorflow_federated/cc/core/impl/executors/status_macros.h" +#include "tensorflow_federated/cc/core/impl/testing/protobuf_matchers.h" #include "tensorflow_federated/proto/v0/array.pb.h" #include "tensorflow_federated/proto/v0/computation.pb.h" #include "tensorflow_federated/proto/v0/data_type.pb.h" diff --git a/tensorflow_federated/cc/core/impl/executors/value_validation_test.cc b/tensorflow_federated/cc/core/impl/executors/value_validation_test.cc index 986cb4669c..484a94428f 100644 --- a/tensorflow_federated/cc/core/impl/executors/value_validation_test.cc +++ b/tensorflow_federated/cc/core/impl/executors/value_validation_test.cc @@ -22,8 +22,8 @@ limitations under the License #include "googletest/include/gtest/gtest.h" #include "absl/status/status.h" #include "absl/types/span.h" -#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" #include "tensorflow_federated/cc/core/impl/executors/value_test_utils.h" +#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h" #include "tensorflow_federated/proto/v0/computation.pb.h" #include "tensorflow_federated/proto/v0/executor.pb.h" diff --git a/tensorflow_federated/cc/core/impl/executors/xla_executor_test.cc b/tensorflow_federated/cc/core/impl/executors/xla_executor_test.cc index c12f1507f6..2af506c059 100644 --- a/tensorflow_federated/cc/core/impl/executors/xla_executor_test.cc +++ b/tensorflow_federated/cc/core/impl/executors/xla_executor_test.cc @@ -45,11 +45,11 @@ limitations under the License #include "tensorflow_federated/cc/core/impl/executors/array_shape_test_utils.h" #include "tensorflow_federated/cc/core/impl/executors/array_test_utils.h" #include "tensorflow_federated/cc/core/impl/executors/executor.h" -#include "tensorflow_federated/cc/core/impl/executors/protobuf_matchers.h" #include "tensorflow_federated/cc/core/impl/executors/status_macros.h" -#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" #include "tensorflow_federated/cc/core/impl/executors/type_test_utils.h" #include "tensorflow_federated/cc/core/impl/executors/value_test_utils.h" +#include "tensorflow_federated/cc/core/impl/testing/protobuf_matchers.h" +#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h" #include "tensorflow_federated/proto/v0/array.pb.h" #include "tensorflow_federated/proto/v0/computation.pb.h" #include "tensorflow_federated/proto/v0/data_type.pb.h" diff --git a/tensorflow_federated/cc/core/impl/executors/xla_utils_test.cc b/tensorflow_federated/cc/core/impl/executors/xla_utils_test.cc index 703a240b13..579c97b088 100644 --- a/tensorflow_federated/cc/core/impl/executors/xla_utils_test.cc +++ b/tensorflow_federated/cc/core/impl/executors/xla_utils_test.cc @@ -31,7 +31,7 @@ limitations under the License #include "tensorflow/compiler/xla/xla_data.pb.h" #include "tensorflow_federated/cc/core/impl/executors/array_shape_test_utils.h" #include "tensorflow_federated/cc/core/impl/executors/array_test_utils.h" -#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" +#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h" #include "tensorflow_federated/proto/v0/array.pb.h" #include "tensorflow_federated/proto/v0/computation.pb.h" #include "tensorflow_federated/proto/v0/data_type.pb.h" diff --git a/tensorflow_federated/cc/core/impl/testing/BUILD b/tensorflow_federated/cc/core/impl/testing/BUILD new file mode 100644 index 0000000000..604fbd829f --- /dev/null +++ b/tensorflow_federated/cc/core/impl/testing/BUILD @@ -0,0 +1,45 @@ +package( + default_applicable_licenses = ["//:package_license"], + default_visibility = [ + ":testing_packages", + "//tensorflow_federated/cc/core/impl:impl_users", + "//tensorflow_federated/cc/core/impl/aggregation:aggregation_packages", + "//tensorflow_federated/cc/core/impl/executor_stacks:executor_stacks_packages", + "//tensorflow_federated/cc/core/impl/executors:executors_packages", + ], +) + +package_group( + name = "testing_packages", + packages = [ + "//tensorflow_federated/cc/core/impl/testing/...", + ], +) + +licenses(["notice"]) + +cc_library( + name = "protobuf_matchers", + testonly = True, + hdrs = ["protobuf_matchers.h"], + deps = [ + "@com_google_absl//absl/memory", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/strings:str_format", + "@com_google_googletest//:gtest", + ], +) + +cc_library( + name = "status_matchers", + testonly = True, + srcs = ["status_matchers.cc"], + hdrs = ["status_matchers.h"], + deps = [ + "@com_github_grpc_grpc//:grpc++", + "@com_google_absl//absl/status", + "@com_google_absl//absl/status:statusor", + "@com_google_absl//absl/strings", + "@com_google_googletest//:gtest", + ], +) diff --git a/tensorflow_federated/cc/core/impl/executors/protobuf_matchers.h b/tensorflow_federated/cc/core/impl/testing/protobuf_matchers.h similarity index 100% rename from tensorflow_federated/cc/core/impl/executors/protobuf_matchers.h rename to tensorflow_federated/cc/core/impl/testing/protobuf_matchers.h diff --git a/tensorflow_federated/cc/core/impl/executors/status_matchers.cc b/tensorflow_federated/cc/core/impl/testing/status_matchers.cc similarity index 98% rename from tensorflow_federated/cc/core/impl/executors/status_matchers.cc rename to tensorflow_federated/cc/core/impl/testing/status_matchers.cc index eb651c947c..69d233b018 100644 --- a/tensorflow_federated/cc/core/impl/executors/status_matchers.cc +++ b/tensorflow_federated/cc/core/impl/testing/status_matchers.cc @@ -12,7 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License ==============================================================================*/ -#include "tensorflow_federated/cc/core/impl/executors/status_matchers.h" + +#include "tensorflow_federated/cc/core/impl/testing/status_matchers.h" #include #include diff --git a/tensorflow_federated/cc/core/impl/executors/status_matchers.h b/tensorflow_federated/cc/core/impl/testing/status_matchers.h similarity index 100% rename from tensorflow_federated/cc/core/impl/executors/status_matchers.h rename to tensorflow_federated/cc/core/impl/testing/status_matchers.h