From 303cbe98857b8353d0a14b2a2aebf8636234efdb Mon Sep 17 00:00:00 2001 From: Nicholas Ormrod Date: Mon, 29 Jul 2024 19:13:44 -0700 Subject: [PATCH] Deshim test_util in fbcode/wangle Summary: The following rules were deshimmed: ``` //folly/experimental:test_util -> //folly/testing:test_util ``` The following headers were deshimmed: ``` folly/experimental/TestUtil.h -> folly/testing/TestUtil.h ``` This is a codemod. It was automatically generated and will be landed once it is approved and tests are passing in sandcastle. You have been added as a reviewer by Sentinel or Butterfly. Autodiff project: detu Autodiff partition: fbcode.wangle Autodiff bookmark: ad.detu.fbcode.wangle Reviewed By: Orvid Differential Revision: D60409950 fbshipit-source-id: acded7d55843033b07a385220886d52e7d5a1583 --- wangle/acceptor/test/AcceptorTest.cpp | 2 +- wangle/acceptor/test/BUCK | 4 ++-- wangle/acceptor/test/SharedSSLContextManagerTest.cpp | 2 +- wangle/bootstrap/test/BUCK | 2 +- wangle/bootstrap/test/BootstrapTest.cpp | 2 +- wangle/client/persistence/test/BUCK | 2 +- wangle/client/persistence/test/TestUtil.cpp | 2 +- wangle/ssl/test/BUCK | 4 ++-- wangle/ssl/test/SSLContextManagerTest.cpp | 2 +- wangle/ssl/test/TLSTicketKeyManagerTest.cpp | 2 +- wangle/util/test/BUCK | 4 ++-- wangle/util/test/FilePollerTest.cpp | 2 +- wangle/util/test/MultiFilePollerTest.cpp | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/wangle/acceptor/test/AcceptorTest.cpp b/wangle/acceptor/test/AcceptorTest.cpp index 3fff7dba0..084e7e00f 100644 --- a/wangle/acceptor/test/AcceptorTest.cpp +++ b/wangle/acceptor/test/AcceptorTest.cpp @@ -14,11 +14,11 @@ * limitations under the License. */ -#include #include #include #include #include +#include #include #include #include diff --git a/wangle/acceptor/test/BUCK b/wangle/acceptor/test/BUCK index f9b441e1f..e827838b4 100644 --- a/wangle/acceptor/test/BUCK +++ b/wangle/acceptor/test/BUCK @@ -49,11 +49,11 @@ cpp_unittest( remote_execution = re_test_utils.remote_execution_linux_default(), supports_static_listing = False, deps = [ - "//folly/experimental:test_util", "//folly/io/async:async_base", "//folly/io/async/test:async_ssl_socket_test_lib", "//folly/portability:gmock", "//folly/portability:gtest", + "//folly/testing:test_util", "//wangle/acceptor:accept_observer", "//wangle/acceptor:acceptor", ], @@ -104,10 +104,10 @@ cpp_unittest( remote_execution = re_test_utils.remote_execution_linux_default(), deps = [ "//folly:file_util", - "//folly/experimental:test_util", "//folly/io/async:async_base", "//folly/portability:gmock", "//folly/portability:gtest", + "//folly/testing:test_util", "//wangle/acceptor:fizz_config_util", "//wangle/acceptor:shared_ssl_context_manager", ], diff --git a/wangle/acceptor/test/SharedSSLContextManagerTest.cpp b/wangle/acceptor/test/SharedSSLContextManagerTest.cpp index 7b90b70f6..a77620f48 100644 --- a/wangle/acceptor/test/SharedSSLContextManagerTest.cpp +++ b/wangle/acceptor/test/SharedSSLContextManagerTest.cpp @@ -18,10 +18,10 @@ #include #include -#include #include #include #include +#include #include #include diff --git a/wangle/bootstrap/test/BUCK b/wangle/bootstrap/test/BUCK index b3b90105c..0c4b1031c 100644 --- a/wangle/bootstrap/test/BUCK +++ b/wangle/bootstrap/test/BUCK @@ -19,9 +19,9 @@ cpp_unittest( srcs = ["BootstrapTest.cpp"], remote_execution = re_test_utils.remote_execution_linux_default(), deps = [ - "//folly/experimental:test_util", "//folly/portability:gtest", "//folly/synchronization:latch", + "//folly/testing:test_util", "//wangle/bootstrap:client_bootstrap", "//wangle/bootstrap:server_bootstrap", "//wangle/channel:handler", diff --git a/wangle/bootstrap/test/BootstrapTest.cpp b/wangle/bootstrap/test/BootstrapTest.cpp index 12a224859..219e84b00 100644 --- a/wangle/bootstrap/test/BootstrapTest.cpp +++ b/wangle/bootstrap/test/BootstrapTest.cpp @@ -20,9 +20,9 @@ #include "wangle/bootstrap/ServerBootstrap.h" #include "wangle/channel/Handler.h" -#include #include #include +#include #include using namespace wangle; diff --git a/wangle/client/persistence/test/BUCK b/wangle/client/persistence/test/BUCK index 9d510a88b..0cb82a454 100644 --- a/wangle/client/persistence/test/BUCK +++ b/wangle/client/persistence/test/BUCK @@ -39,7 +39,7 @@ cpp_library( "TestUtil.h", ], deps = [ - "//folly/experimental:test_util", + "//folly/testing:test_util", ], exported_deps = [ "//folly:memory", diff --git a/wangle/client/persistence/test/TestUtil.cpp b/wangle/client/persistence/test/TestUtil.cpp index a5e97de9a..6fc98847a 100644 --- a/wangle/client/persistence/test/TestUtil.cpp +++ b/wangle/client/persistence/test/TestUtil.cpp @@ -16,7 +16,7 @@ #include -#include +#include namespace wangle { diff --git a/wangle/ssl/test/BUCK b/wangle/ssl/test/BUCK index 749b7bc65..4f18a08be 100644 --- a/wangle/ssl/test/BUCK +++ b/wangle/ssl/test/BUCK @@ -13,11 +13,11 @@ cpp_unittest( ], remote_execution = re_test_utils.remote_execution_linux_default(), deps = [ - "//folly/experimental:test_util", "//folly/io/async:async_base", "//folly/io/async:ssl_context", "//folly/io/async/test:test_ssl_server", "//folly/portability:gtest", + "//folly/testing:test_util", "//wangle/acceptor:util", "//wangle/ssl:server_ssl_context", "//wangle/ssl:ssl_cache_options", @@ -38,7 +38,6 @@ cpp_unittest( remote_execution = re_test_utils.remote_execution_linux_default(), deps = [ ":mock_ssl_stats", - "//folly/experimental:test_util", "//folly/io/async:async_base", "//folly/io/async:async_ssl_socket", "//folly/io/async:ssl_context", @@ -46,6 +45,7 @@ cpp_unittest( "//folly/io/async/test:test_ssl_server", "//folly/portability:gmock", "//folly/portability:gtest", + "//folly/testing:test_util", "//wangle/ssl:ssl_stats", "//wangle/ssl:tls_ticket_key_manager", ], diff --git a/wangle/ssl/test/SSLContextManagerTest.cpp b/wangle/ssl/test/SSLContextManagerTest.cpp index 2dbe23367..10cf597e6 100644 --- a/wangle/ssl/test/SSLContextManagerTest.cpp +++ b/wangle/ssl/test/SSLContextManagerTest.cpp @@ -25,8 +25,8 @@ #include #if defined(WANGLE_USE_FOLLY_TESTUTIL) -#include #include +#include namespace { std::string get_resource(const char* res) { diff --git a/wangle/ssl/test/TLSTicketKeyManagerTest.cpp b/wangle/ssl/test/TLSTicketKeyManagerTest.cpp index 9d3b46948..8f7e4f783 100644 --- a/wangle/ssl/test/TLSTicketKeyManagerTest.cpp +++ b/wangle/ssl/test/TLSTicketKeyManagerTest.cpp @@ -25,8 +25,8 @@ #include #if defined(WANGLE_USE_FOLLY_TESTUTIL) -#include #include +#include namespace { std::string get_resource(const char* res) { diff --git a/wangle/util/test/BUCK b/wangle/util/test/BUCK index dcb051f44..63585cc21 100644 --- a/wangle/util/test/BUCK +++ b/wangle/util/test/BUCK @@ -9,10 +9,10 @@ cpp_unittest( "//folly:file", "//folly:file_util", "//folly:singleton", - "//folly/experimental:test_util", "//folly/portability:gtest", "//folly/portability:sys_stat", "//folly/synchronization:baton", + "//folly/testing:test_util", "//wangle/util:file_poller", ], external_deps = [ @@ -29,10 +29,10 @@ cpp_unittest( "//folly:file_util", "//folly:map_util", "//folly:string", - "//folly/experimental:test_util", "//folly/futures:core", "//folly/portability:gtest", "//folly/synchronization:saturating_semaphore", + "//folly/testing:test_util", "//wangle/util:multi_file_poller", ], ) diff --git a/wangle/util/test/FilePollerTest.cpp b/wangle/util/test/FilePollerTest.cpp index 9cec4c05d..35a8a1f8b 100644 --- a/wangle/util/test/FilePollerTest.cpp +++ b/wangle/util/test/FilePollerTest.cpp @@ -21,10 +21,10 @@ #include #include #include -#include #include #include #include +#include #include #include diff --git a/wangle/util/test/MultiFilePollerTest.cpp b/wangle/util/test/MultiFilePollerTest.cpp index 9c5445e25..87f8cfc39 100644 --- a/wangle/util/test/MultiFilePollerTest.cpp +++ b/wangle/util/test/MultiFilePollerTest.cpp @@ -19,10 +19,10 @@ #include #include #include -#include #include #include #include +#include using namespace wangle; using namespace folly::test;