@@ -33,36 +33,28 @@ class TestApi : public testing::StubFlutterApi {
3333 return message_engine_result;
3434 }
3535
36+ // Called for FlutterDesktopMessengerSetCallback.
3637 void MessengerSetCallback (const char * channel,
3738 FlutterDesktopMessageCallback callback,
3839 void * user_data) override {
39- last_message_callback_set_ = callback;
40- }
41-
42- void RegistrarSetDestructionHandler (
43- FlutterDesktopOnRegistrarDestroyed callback) override {
44- last_destruction_callback_set_ = callback;
40+ last_callback_set_ = callback;
4541 }
4642
4743 const uint8_t * last_data_sent () { return last_data_sent_; }
48- FlutterDesktopMessageCallback last_message_callback_set () {
49- return last_message_callback_set_;
50- }
51- FlutterDesktopOnRegistrarDestroyed last_destruction_callback_set () {
52- return last_destruction_callback_set_;
44+ FlutterDesktopMessageCallback last_callback_set () {
45+ return last_callback_set_;
5346 }
5447
5548 private:
5649 const uint8_t * last_data_sent_ = nullptr ;
57- FlutterDesktopMessageCallback last_message_callback_set_ = nullptr ;
58- FlutterDesktopOnRegistrarDestroyed last_destruction_callback_set_ = nullptr ;
50+ FlutterDesktopMessageCallback last_callback_set_ = nullptr ;
5951};
6052
6153} // namespace
6254
6355// Tests that the registrar returns a messenger that passes Send through to the
6456// C API.
65- TEST (PluginRegistrarTest , MessengerSend) {
57+ TEST (MethodCallTest , MessengerSend) {
6658 testing::ScopedStubFlutterApi scoped_api_stub (std::make_unique<TestApi>());
6759 auto test_api = static_cast <TestApi*>(scoped_api_stub.stub ());
6860
@@ -78,7 +70,7 @@ TEST(PluginRegistrarTest, MessengerSend) {
7870
7971// Tests that the registrar returns a messenger that passes callback
8072// registration and unregistration through to the C API.
81- TEST (PluginRegistrarTest , MessengerSetMessageHandler) {
73+ TEST (MethodCallTest , MessengerSetMessageHandler) {
8274 testing::ScopedStubFlutterApi scoped_api_stub (std::make_unique<TestApi>());
8375 auto test_api = static_cast <TestApi*>(scoped_api_stub.stub ());
8476
@@ -93,60 +85,11 @@ TEST(PluginRegistrarTest, MessengerSetMessageHandler) {
9385 const size_t message_size,
9486 BinaryReply reply) {};
9587 messenger->SetMessageHandler (channel_name, std::move (binary_handler));
96- EXPECT_NE (test_api->last_message_callback_set (), nullptr );
88+ EXPECT_NE (test_api->last_callback_set (), nullptr );
9789
9890 // Unregister.
9991 messenger->SetMessageHandler (channel_name, nullptr );
100- EXPECT_EQ (test_api->last_message_callback_set (), nullptr );
101- }
102-
103- // Tests that the registrar manager returns the same instance when getting
104- // the wrapper for the same reference.
105- TEST (PluginRegistrarTest, ManagerSameInstance) {
106- testing::ScopedStubFlutterApi scoped_api_stub (std::make_unique<TestApi>());
107-
108- auto dummy_registrar_handle =
109- reinterpret_cast <FlutterDesktopPluginRegistrarRef>(1 );
110-
111- PluginRegistrarManager* manager = PluginRegistrarManager::GetInstance ();
112- EXPECT_EQ (manager->GetRegistrar <PluginRegistrar>(dummy_registrar_handle),
113- manager->GetRegistrar <PluginRegistrar>(dummy_registrar_handle));
114- }
115-
116- // Tests that the registrar manager returns different objects for different
117- // references.
118- TEST (PluginRegistrarTest, ManagerDifferentInstances) {
119- testing::ScopedStubFlutterApi scoped_api_stub (std::make_unique<TestApi>());
120-
121- auto dummy_registrar_handle_a =
122- reinterpret_cast <FlutterDesktopPluginRegistrarRef>(1 );
123- auto dummy_registrar_handle_b =
124- reinterpret_cast <FlutterDesktopPluginRegistrarRef>(2 );
125-
126- PluginRegistrarManager* manager = PluginRegistrarManager::GetInstance ();
127- EXPECT_NE (manager->GetRegistrar <PluginRegistrar>(dummy_registrar_handle_a),
128- manager->GetRegistrar <PluginRegistrar>(dummy_registrar_handle_b));
129- }
130-
131- // Tests that the registrar manager deletes wrappers when the underlying
132- // reference is destroyed.
133- TEST (PluginRegistrarTest, ManagerRemovesOnDestruction) {
134- testing::ScopedStubFlutterApi scoped_api_stub (std::make_unique<TestApi>());
135- auto test_api = static_cast <TestApi*>(scoped_api_stub.stub ());
136-
137- auto dummy_registrar_handle =
138- reinterpret_cast <FlutterDesktopPluginRegistrarRef>(1 );
139- PluginRegistrarManager* manager = PluginRegistrarManager::GetInstance ();
140- auto * first_wrapper =
141- manager->GetRegistrar <PluginRegistrar>(dummy_registrar_handle);
142-
143- // Simulate destruction of the reference.
144- EXPECT_NE (test_api->last_destruction_callback_set (), nullptr );
145- test_api->last_destruction_callback_set ()(dummy_registrar_handle);
146-
147- // Requesting the wrapper should now create a new object.
148- EXPECT_NE (manager->GetRegistrar <PluginRegistrar>(dummy_registrar_handle),
149- first_wrapper);
92+ EXPECT_EQ (test_api->last_callback_set (), nullptr );
15093}
15194
15295} // namespace flutter
0 commit comments