From c4d12c21d93560b77be14d8b42cd5dcefe411217 Mon Sep 17 00:00:00 2001 From: John Knox Date: Mon, 24 Sep 2018 06:56:42 -0700 Subject: [PATCH] Rename Mock classes Summary: Part of sonar to flipper rename Reviewed By: priteshrnandgaonkar Differential Revision: D9929102 fbshipit-source-id: 88cdbd33aa5c76e386449f54f4eb8c6435865ed1 --- docs/testing.md | 4 +-- ...{SonarPluginMock.h => FlipperPluginMock.h} | 8 ++--- ...ResponderMock.h => FlipperResponderMock.h} | 4 +-- xplat/FlipperTests/FlipperClientTests.cpp | 30 +++++++++---------- 4 files changed, 23 insertions(+), 23 deletions(-) rename xplat/FlipperTestLib/{SonarPluginMock.h => FlipperPluginMock.h} (89%) rename xplat/FlipperTestLib/{SonarResponderMock.h => FlipperResponderMock.h} (91%) diff --git a/docs/testing.md b/docs/testing.md index 719421324..41d698ae8 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -55,7 +55,7 @@ Start by creating your first test file in this directory `MySonarPluginTests.cpp ``` #include #include -#include +#include #include #include @@ -78,7 +78,7 @@ Here is a simple test using these mock utilities to create a plugin, send some d ``` TEST(MySonarPluginTests, testDummy) { std::vector successfulResponses; - auto responder = std::make_unique(&successfulResponses); + auto responder = std::make_unique(&successfulResponses); auto conn = std::make_shared(); MySonarPlugin plugin; diff --git a/xplat/FlipperTestLib/SonarPluginMock.h b/xplat/FlipperTestLib/FlipperPluginMock.h similarity index 89% rename from xplat/FlipperTestLib/SonarPluginMock.h rename to xplat/FlipperTestLib/FlipperPluginMock.h index 31c2e85c1..20a27b64f 100644 --- a/xplat/FlipperTestLib/SonarPluginMock.h +++ b/xplat/FlipperTestLib/FlipperPluginMock.h @@ -14,20 +14,20 @@ namespace facebook { namespace flipper { namespace test { -class SonarPluginMock : public FlipperPlugin { +class FlipperPluginMock : public FlipperPlugin { using ConnectionCallback = std::function)>; using DisconnectionCallback = std::function; public: - SonarPluginMock(const std::string& identifier) : identifier_(identifier) {} + FlipperPluginMock(const std::string& identifier) : identifier_(identifier) {} - SonarPluginMock( + FlipperPluginMock( const std::string& identifier, const ConnectionCallback& connectionCallback) : identifier_(identifier), connectionCallback_(connectionCallback) {} - SonarPluginMock( + FlipperPluginMock( const std::string& identifier, const ConnectionCallback& connectionCallback, const DisconnectionCallback& disconnectionCallback) diff --git a/xplat/FlipperTestLib/SonarResponderMock.h b/xplat/FlipperTestLib/FlipperResponderMock.h similarity index 91% rename from xplat/FlipperTestLib/SonarResponderMock.h rename to xplat/FlipperTestLib/FlipperResponderMock.h index 617ef5025..2e763da3b 100644 --- a/xplat/FlipperTestLib/SonarResponderMock.h +++ b/xplat/FlipperTestLib/FlipperResponderMock.h @@ -15,9 +15,9 @@ namespace facebook { namespace flipper { -class SonarResponderMock : public FlipperResponder { +class FlipperResponderMock : public FlipperResponder { public: - SonarResponderMock( + FlipperResponderMock( std::vector* successes = nullptr, std::vector* errors = nullptr) : successes_(successes), errors_(errors) {} diff --git a/xplat/FlipperTests/FlipperClientTests.cpp b/xplat/FlipperTests/FlipperClientTests.cpp index d1f0f173b..853f1eca9 100644 --- a/xplat/FlipperTests/FlipperClientTests.cpp +++ b/xplat/FlipperTests/FlipperClientTests.cpp @@ -7,7 +7,7 @@ */ #include -#include +#include #include #include @@ -28,7 +28,7 @@ TEST(FlipperClientTests, testSaneMocks) { socket.stop(); EXPECT_FALSE(socket.isOpen()); - SonarPluginMock plugin("Test"); + FlipperPluginMock plugin("Test"); EXPECT_EQ(plugin.identifier(), "Test"); } @@ -37,8 +37,8 @@ TEST(FlipperClientTests, testGetPlugins) { FlipperClient client(std::unique_ptr{socket}, state); client.start(); - client.addPlugin(std::make_shared("Cat")); - client.addPlugin(std::make_shared("Dog")); + client.addPlugin(std::make_shared("Cat")); + client.addPlugin(std::make_shared("Dog")); dynamic message = dynamic::object("id", 1)("method", "getPlugins"); socket->callbacks->onMessageReceived(message); @@ -52,9 +52,9 @@ TEST(FlipperClientTests, testGetPlugin) { auto socket = new FlipperConnectionManagerMock; FlipperClient client(std::unique_ptr{socket}, state); - const auto catPlugin = std::make_shared("Cat"); + const auto catPlugin = std::make_shared("Cat"); client.addPlugin(catPlugin); - const auto dogPlugin = std::make_shared("Dog"); + const auto dogPlugin = std::make_shared("Dog"); client.addPlugin(dogPlugin); EXPECT_EQ(catPlugin, client.getPlugin("Cat")); @@ -65,9 +65,9 @@ TEST(FlipperClientTests, testGetPluginWithDowncast) { auto socket = new FlipperConnectionManagerMock; FlipperClient client(std::unique_ptr{socket}, state); - const auto catPlugin = std::make_shared("Cat"); + const auto catPlugin = std::make_shared("Cat"); client.addPlugin(catPlugin); - EXPECT_EQ(catPlugin, client.getPlugin("Cat")); + EXPECT_EQ(catPlugin, client.getPlugin("Cat")); } TEST(FlipperClientTests, testRemovePlugin) { @@ -75,7 +75,7 @@ TEST(FlipperClientTests, testRemovePlugin) { FlipperClient client(std::unique_ptr{socket}, state); client.start(); - auto plugin = std::make_shared("Test"); + auto plugin = std::make_shared("Test"); client.addPlugin(plugin); client.removePlugin(plugin); @@ -107,7 +107,7 @@ TEST(FlipperClientTests, testConnectDisconnect) { pluginConnected = true; }; const auto disconnectionCallback = [&]() { pluginConnected = false; }; - auto plugin = std::make_shared("Test", connectionCallback, + auto plugin = std::make_shared("Test", connectionCallback, disconnectionCallback); client.addPlugin(plugin); @@ -130,7 +130,7 @@ TEST(FlipperClientTests, testInitDeinit) { pluginConnected = true; }; const auto disconnectionCallback = [&]() { pluginConnected = false; }; - auto plugin = std::make_shared("Test", connectionCallback, + auto plugin = std::make_shared("Test", connectionCallback, disconnectionCallback); client.start(); @@ -168,7 +168,7 @@ TEST(FlipperClientTests, testRemovePluginWhenConnected) { pluginConnected = true; }; const auto disconnectionCallback = [&]() { pluginConnected = false; }; - auto plugin = std::make_shared("Test", connectionCallback, + auto plugin = std::make_shared("Test", connectionCallback, disconnectionCallback); client.addPlugin(plugin); @@ -184,7 +184,7 @@ TEST(FlipperClientTests, testUnhandleableMethod) { auto socket = new FlipperConnectionManagerMock; FlipperClient client(std::unique_ptr{socket}, state); - auto plugin = std::make_shared("Test"); + auto plugin = std::make_shared("Test"); client.addPlugin(plugin); dynamic messageInit = dynamic::object("method", "init")( @@ -213,7 +213,7 @@ TEST(FlipperClientTests, testExecute) { }; conn->receive("plugin_can_u_hear_me", receiver); }; - auto plugin = std::make_shared("Test", connectionCallback); + auto plugin = std::make_shared("Test", connectionCallback); client.addPlugin(plugin); dynamic messageInit = dynamic::object("method", "init")( @@ -245,7 +245,7 @@ TEST(FlipperClientTests, testExecuteWithParams) { }; conn->receive("animal_sounds", receiver); }; - auto plugin = std::make_shared("Test", connectionCallback); + auto plugin = std::make_shared("Test", connectionCallback); client.addPlugin(plugin); dynamic messageInit = dynamic::object("method", "init")(