jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename Mock classes

Browse Source 
Summary: Part of sonar to flipper rename

Reviewed By: priteshrnandgaonkar

Differential Revision: D9929102

fbshipit-source-id: 88cdbd33aa5c76e386449f54f4eb8c6435865ed1
This commit is contained in:
John Knox
2018-09-24 06:56:42 -07:00
committed by Facebook Github Bot
parent c18c8ac802
commit c4d12c21d9
4 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/testing.md
View File

@@ -55,7 +55,7 @@ Start by creating your first test file in this directory `MySonarPluginTests.cpp
``` ```
#include <MySonarPlugin/MySonarPlugin.h> #include <MySonarPlugin/MySonarPlugin.h>
#include <FlipperTestLib/FlipperConnectionMock.h> #include <FlipperTestLib/FlipperConnectionMock.h>
#include <FlipperTestLib/SonarResponderMock.h> #include <FlipperTestLib/FlipperResponderMock.h>
#include <folly/json.h> #include <folly/json.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
@@ -78,7 +78,7 @@ Here is a simple test using these mock utilities to create a plugin, send some d
``` ```
TEST(MySonarPluginTests, testDummy) { TEST(MySonarPluginTests, testDummy) {
std::vector<folly::dynamic> successfulResponses; std::vector<folly::dynamic> successfulResponses;
auto responder = std::make_unique<SonarResponderMock>(&successfulResponses); auto responder = std::make_unique<FlipperResponderMock>(&successfulResponses);
auto conn = std::make_shared<FlipperConnectionMock>(); auto conn = std::make_shared<FlipperConnectionMock>();
MySonarPlugin plugin; MySonarPlugin plugin;

8
xplat/FlipperTestLib/SonarPluginMock.h → xplat/FlipperTestLib/FlipperPluginMock.h
View File

@@ -14,20 +14,20 @@ namespace facebook {
namespace flipper { namespace flipper {
namespace test { namespace test {
class SonarPluginMock : public FlipperPlugin { class FlipperPluginMock : public FlipperPlugin {
using ConnectionCallback = using ConnectionCallback =
std::function<void(std::shared_ptr<FlipperConnection>)>; std::function<void(std::shared_ptr<FlipperConnection>)>;
using DisconnectionCallback = std::function<void()>; using DisconnectionCallback = std::function<void()>;
public: public:
SonarPluginMock(const std::string& identifier) : identifier_(identifier) {} FlipperPluginMock(const std::string& identifier) : identifier_(identifier) {}
SonarPluginMock( FlipperPluginMock(
const std::string& identifier, const std::string& identifier,
const ConnectionCallback& connectionCallback) const ConnectionCallback& connectionCallback)
: identifier_(identifier), connectionCallback_(connectionCallback) {} : identifier_(identifier), connectionCallback_(connectionCallback) {}
SonarPluginMock( FlipperPluginMock(
const std::string& identifier, const std::string& identifier,
const ConnectionCallback& connectionCallback, const ConnectionCallback& connectionCallback,
const DisconnectionCallback& disconnectionCallback) const DisconnectionCallback& disconnectionCallback)

4
xplat/FlipperTestLib/SonarResponderMock.h → xplat/FlipperTestLib/FlipperResponderMock.h
View File

@@ -15,9 +15,9 @@
namespace facebook { namespace facebook {
namespace flipper { namespace flipper {
class SonarResponderMock : public FlipperResponder { class FlipperResponderMock : public FlipperResponder {
public: public:
SonarResponderMock( FlipperResponderMock(
std::vector<folly::dynamic>* successes = nullptr, std::vector<folly::dynamic>* successes = nullptr,
std::vector<folly::dynamic>* errors = nullptr) std::vector<folly::dynamic>* errors = nullptr)
: successes_(successes), errors_(errors) {} : successes_(successes), errors_(errors) {}

30
xplat/FlipperTests/FlipperClientTests.cpp
View File

@@ -7,7 +7,7 @@
*/ */
#include <Flipper/FlipperClient.h> #include <Flipper/FlipperClient.h>
#include <FlipperTestLib/SonarPluginMock.h> #include <FlipperTestLib/FlipperPluginMock.h>
#include <FlipperTestLib/FlipperConnectionManagerMock.h> #include <FlipperTestLib/FlipperConnectionManagerMock.h>
#include <folly/json.h> #include <folly/json.h>
@@ -28,7 +28,7 @@ TEST(FlipperClientTests, testSaneMocks) {
socket.stop(); socket.stop();
EXPECT_FALSE(socket.isOpen()); EXPECT_FALSE(socket.isOpen());
SonarPluginMock plugin("Test"); FlipperPluginMock plugin("Test");
EXPECT_EQ(plugin.identifier(), "Test"); EXPECT_EQ(plugin.identifier(), "Test");
} }
@@ -37,8 +37,8 @@ TEST(FlipperClientTests, testGetPlugins) {
FlipperClient client(std::unique_ptr<FlipperConnectionManagerMock>{socket}, state); FlipperClient client(std::unique_ptr<FlipperConnectionManagerMock>{socket}, state);
client.start(); client.start();
client.addPlugin(std::make_shared<SonarPluginMock>("Cat")); client.addPlugin(std::make_shared<FlipperPluginMock>("Cat"));
client.addPlugin(std::make_shared<SonarPluginMock>("Dog")); client.addPlugin(std::make_shared<FlipperPluginMock>("Dog"));
dynamic message = dynamic::object("id", 1)("method", "getPlugins"); dynamic message = dynamic::object("id", 1)("method", "getPlugins");
socket->callbacks->onMessageReceived(message); socket->callbacks->onMessageReceived(message);
@@ -52,9 +52,9 @@ TEST(FlipperClientTests, testGetPlugin) {
auto socket = new FlipperConnectionManagerMock; auto socket = new FlipperConnectionManagerMock;
FlipperClient client(std::unique_ptr<FlipperConnectionManagerMock>{socket}, state); FlipperClient client(std::unique_ptr<FlipperConnectionManagerMock>{socket}, state);
const auto catPlugin = std::make_shared<SonarPluginMock>("Cat"); const auto catPlugin = std::make_shared<FlipperPluginMock>("Cat");
client.addPlugin(catPlugin); client.addPlugin(catPlugin);
const auto dogPlugin = std::make_shared<SonarPluginMock>("Dog"); const auto dogPlugin = std::make_shared<FlipperPluginMock>("Dog");
client.addPlugin(dogPlugin); client.addPlugin(dogPlugin);
EXPECT_EQ(catPlugin, client.getPlugin("Cat")); EXPECT_EQ(catPlugin, client.getPlugin("Cat"));
@@ -65,9 +65,9 @@ TEST(FlipperClientTests, testGetPluginWithDowncast) {
auto socket = new FlipperConnectionManagerMock; auto socket = new FlipperConnectionManagerMock;
FlipperClient client(std::unique_ptr<FlipperConnectionManagerMock>{socket}, state); FlipperClient client(std::unique_ptr<FlipperConnectionManagerMock>{socket}, state);
const auto catPlugin = std::make_shared<SonarPluginMock>("Cat"); const auto catPlugin = std::make_shared<FlipperPluginMock>("Cat");
client.addPlugin(catPlugin); client.addPlugin(catPlugin);
EXPECT_EQ(catPlugin, client.getPlugin<SonarPluginMock>("Cat")); EXPECT_EQ(catPlugin, client.getPlugin<FlipperPluginMock>("Cat"));
} }
TEST(FlipperClientTests, testRemovePlugin) { TEST(FlipperClientTests, testRemovePlugin) {
@@ -75,7 +75,7 @@ TEST(FlipperClientTests, testRemovePlugin) {
FlipperClient client(std::unique_ptr<FlipperConnectionManagerMock>{socket}, state); FlipperClient client(std::unique_ptr<FlipperConnectionManagerMock>{socket}, state);
client.start(); client.start();
auto plugin = std::make_shared<SonarPluginMock>("Test"); auto plugin = std::make_shared<FlipperPluginMock>("Test");
client.addPlugin(plugin); client.addPlugin(plugin);
client.removePlugin(plugin); client.removePlugin(plugin);
@@ -107,7 +107,7 @@ TEST(FlipperClientTests, testConnectDisconnect) {
pluginConnected = true; pluginConnected = true;
}; };
const auto disconnectionCallback = [&]() { pluginConnected = false; }; const auto disconnectionCallback = [&]() { pluginConnected = false; };
auto plugin = std::make_shared<SonarPluginMock>("Test", connectionCallback, auto plugin = std::make_shared<FlipperPluginMock>("Test", connectionCallback,
disconnectionCallback); disconnectionCallback);
client.addPlugin(plugin); client.addPlugin(plugin);
@@ -130,7 +130,7 @@ TEST(FlipperClientTests, testInitDeinit) {
pluginConnected = true; pluginConnected = true;
}; };
const auto disconnectionCallback = [&]() { pluginConnected = false; }; const auto disconnectionCallback = [&]() { pluginConnected = false; };
auto plugin = std::make_shared<SonarPluginMock>("Test", connectionCallback, auto plugin = std::make_shared<FlipperPluginMock>("Test", connectionCallback,
disconnectionCallback); disconnectionCallback);
client.start(); client.start();
@@ -168,7 +168,7 @@ TEST(FlipperClientTests, testRemovePluginWhenConnected) {
pluginConnected = true; pluginConnected = true;
}; };
const auto disconnectionCallback = [&]() { pluginConnected = false; }; const auto disconnectionCallback = [&]() { pluginConnected = false; };
auto plugin = std::make_shared<SonarPluginMock>("Test", connectionCallback, auto plugin = std::make_shared<FlipperPluginMock>("Test", connectionCallback,
disconnectionCallback); disconnectionCallback);
client.addPlugin(plugin); client.addPlugin(plugin);
@@ -184,7 +184,7 @@ TEST(FlipperClientTests, testUnhandleableMethod) {
auto socket = new FlipperConnectionManagerMock; auto socket = new FlipperConnectionManagerMock;
FlipperClient client(std::unique_ptr<FlipperConnectionManagerMock>{socket}, state); FlipperClient client(std::unique_ptr<FlipperConnectionManagerMock>{socket}, state);
auto plugin = std::make_shared<SonarPluginMock>("Test"); auto plugin = std::make_shared<FlipperPluginMock>("Test");
client.addPlugin(plugin); client.addPlugin(plugin);
dynamic messageInit = dynamic::object("method", "init")( dynamic messageInit = dynamic::object("method", "init")(
@@ -213,7 +213,7 @@ TEST(FlipperClientTests, testExecute) {
}; };
conn->receive("plugin_can_u_hear_me", receiver); conn->receive("plugin_can_u_hear_me", receiver);
}; };
auto plugin = std::make_shared<SonarPluginMock>("Test", connectionCallback); auto plugin = std::make_shared<FlipperPluginMock>("Test", connectionCallback);
client.addPlugin(plugin); client.addPlugin(plugin);
dynamic messageInit = dynamic::object("method", "init")( dynamic messageInit = dynamic::object("method", "init")(
@@ -245,7 +245,7 @@ TEST(FlipperClientTests, testExecuteWithParams) {
}; };
conn->receive("animal_sounds", receiver); conn->receive("animal_sounds", receiver);
}; };
auto plugin = std::make_shared<SonarPluginMock>("Test", connectionCallback); auto plugin = std::make_shared<FlipperPluginMock>("Test", connectionCallback);
client.addPlugin(plugin); client.addPlugin(plugin);
dynamic messageInit = dynamic::object("method", "init")( dynamic messageInit = dynamic::object("method", "init")(