diff --git a/packages/pigeon/platform_tests/test_plugin/example/windows/CMakeLists.txt b/packages/pigeon/platform_tests/test_plugin/example/windows/CMakeLists.txt index 57446d58333a..2324be7b66a6 100644 --- a/packages/pigeon/platform_tests/test_plugin/example/windows/CMakeLists.txt +++ b/packages/pigeon/platform_tests/test_plugin/example/windows/CMakeLists.txt @@ -45,6 +45,9 @@ function(APPLY_STANDARD_SETTINGS TARGET) target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") endfunction() +# Enable the test target. +set(include_test_plugin_tests TRUE) + # Flutter library and tool build rules. set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") add_subdirectory(${FLUTTER_MANAGED_DIR}) diff --git a/packages/pigeon/platform_tests/test_plugin/windows/CMakeLists.txt b/packages/pigeon/platform_tests/test_plugin/windows/CMakeLists.txt index 795eebb16b4f..948121626537 100644 --- a/packages/pigeon/platform_tests/test_plugin/windows/CMakeLists.txt +++ b/packages/pigeon/platform_tests/test_plugin/windows/CMakeLists.txt @@ -51,3 +51,88 @@ set(test_plugin_bundled_libraries "" PARENT_SCOPE ) + +# === Tests === + +if (${include_${PROJECT_NAME}_tests}) +set(TEST_RUNNER "${PROJECT_NAME}_test") +enable_testing() +# TODO(stuartmorgan): Consider using a single shared, pre-checked-in googletest +# instance rather than downloading for each plugin. This approach makes sense +# for a template, but not for a monorepo with many plugins. +include(FetchContent) +FetchContent_Declare( + googletest + URL https://github.com/google/googletest/archive/release-1.11.0.zip +) +# Prevent overriding the parent project's compiler/linker settings +set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) +# Disable install commands for gtest so it doesn't end up in the bundle. +set(INSTALL_GTEST OFF CACHE BOOL "Disable installation of googletest" FORCE) + +FetchContent_MakeAvailable(googletest) + +# The plugin's C API is not very useful for unit testing, so build the sources +# directly into the test binary rather than using the DLL. +add_executable(${TEST_RUNNER} + # Tests. + test/multiple_arity_test.cpp + test/non_null_fields_test.cpp + test/nullable_returns_test.cpp + test/null_fields_test.cpp + test/pigeon_test.cpp + test/primitive_test.cpp + # Generated sources. + test/all_datatypes.g.cpp + test/all_datatypes.g.h + test/all_void.g.cpp + test/all_void.g.h + test/async_handlers.g.cpp + test/async_handlers.g.h + test/enum.g.cpp + test/enum.g.h + test/host2flutter.g.cpp + test/host2flutter.g.h + test/list.g.cpp + test/list.g.h + test/message.g.cpp + test/message.g.h + test/multiple_arity.g.cpp + test/multiple_arity.g.h + test/non_null_fields.g.cpp + test/non_null_fields.g.h + test/null_fields.g.cpp + test/null_fields.g.h + test/nullable_returns.g.cpp + test/nullable_returns.g.h + test/primitive.g.cpp + test/primitive.g.h + test/void_arg_flutter.g.cpp + test/void_arg_flutter.g.h + test/void_arg_host.g.cpp + test/void_arg_host.g.h + test/voidflutter.g.cpp + test/voidflutter.g.h + test/voidhost.g.cpp + test/voidhost.g.h + # Test utilities. + test/utils/echo_messenger.cpp + test/utils/echo_messenger.h + test/utils/fake_host_messenger.cpp + test/utils/fake_host_messenger.h + + ${PLUGIN_SOURCES} +) +apply_standard_settings(${TEST_RUNNER}) +target_include_directories(${TEST_RUNNER} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}") +target_link_libraries(${TEST_RUNNER} PRIVATE flutter_wrapper_plugin) +target_link_libraries(${TEST_RUNNER} PRIVATE gtest_main gmock) +# flutter_wrapper_plugin has link dependencies on the Flutter DLL. +add_custom_command(TARGET ${TEST_RUNNER} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${FLUTTER_LIBRARY}" $ +) + +include(GoogleTest) +gtest_discover_tests(${TEST_RUNNER}) +endif() diff --git a/packages/pigeon/platform_tests/test_plugin/windows/test/.gitignore b/packages/pigeon/platform_tests/test_plugin/windows/test/.gitignore new file mode 100644 index 000000000000..9fcc83523715 --- /dev/null +++ b/packages/pigeon/platform_tests/test_plugin/windows/test/.gitignore @@ -0,0 +1,5 @@ +# TODO(stuartmorgan): Remove this, so that review will show the effects of +# changes on generated files. This will need a way to avoid unnecessary churn, +# such as a flag to suppress version stamp generation. +*.g.h +*.g.cpp diff --git a/packages/pigeon/platform_tests/windows_unit_tests/windows/test/multiple_arity_test.cpp b/packages/pigeon/platform_tests/test_plugin/windows/test/multiple_arity_test.cpp similarity index 100% rename from packages/pigeon/platform_tests/windows_unit_tests/windows/test/multiple_arity_test.cpp rename to packages/pigeon/platform_tests/test_plugin/windows/test/multiple_arity_test.cpp diff --git a/packages/pigeon/platform_tests/windows_unit_tests/windows/test/non_null_fields_test.cpp b/packages/pigeon/platform_tests/test_plugin/windows/test/non_null_fields_test.cpp similarity index 100% rename from packages/pigeon/platform_tests/windows_unit_tests/windows/test/non_null_fields_test.cpp rename to packages/pigeon/platform_tests/test_plugin/windows/test/non_null_fields_test.cpp diff --git a/packages/pigeon/platform_tests/windows_unit_tests/windows/test/null_fields_test.cpp b/packages/pigeon/platform_tests/test_plugin/windows/test/null_fields_test.cpp similarity index 92% rename from packages/pigeon/platform_tests/windows_unit_tests/windows/test/null_fields_test.cpp rename to packages/pigeon/platform_tests/test_plugin/windows/test/null_fields_test.cpp index 1bb59536825c..a1c408add4cc 100644 --- a/packages/pigeon/platform_tests/windows_unit_tests/windows/test/null_fields_test.cpp +++ b/packages/pigeon/platform_tests/test_plugin/windows/test/null_fields_test.cpp @@ -20,13 +20,13 @@ using flutter::EncodableValue; // This gives useful test failure messages instead of silent crashes when the // value isn't present, or has the wrong type. template -const T *ExpectAndGet(const EncodableMap &map, const std::string &key) { +const T* ExpectAndGet(const EncodableMap& map, const std::string& key) { auto it = map.find(EncodableValue(key)); EXPECT_TRUE(it != map.end()) << "Could not find value for '" << key << '"'; if (it == map.end()) { return nullptr; } - const T *value_ptr = std::get_if(&(it->second)); + const T* value_ptr = std::get_if(&(it->second)); EXPECT_NE(value_ptr, nullptr) << "Value for '" << key << "' has incorrect type"; return value_ptr; @@ -37,20 +37,20 @@ const T *ExpectAndGet(const EncodableMap &map, const std::string &key) { class NullFieldsTest : public ::testing::Test { protected: // Wrapper for access to private NullFieldsSearchRequest map constructor. - NullFieldsSearchRequest RequestFromMap(const EncodableMap &map) { + NullFieldsSearchRequest RequestFromMap(const EncodableMap& map) { return NullFieldsSearchRequest(map); } // Wrapper for access to private NullFieldsSearchRequest map constructor. - NullFieldsSearchReply ReplyFromMap(const EncodableMap &map) { + NullFieldsSearchReply ReplyFromMap(const EncodableMap& map) { return NullFieldsSearchReply(map); } // Wrapper for access to private NullFieldsSearchRequest::ToEncodableMap. - EncodableMap MapFromRequest(const NullFieldsSearchRequest &request) { + EncodableMap MapFromRequest(const NullFieldsSearchRequest& request) { return request.ToEncodableMap(); } // Wrapper for access to private NullFieldsSearchRequest map constructor. - EncodableMap MapFromReply(const NullFieldsSearchReply &reply) { + EncodableMap MapFromReply(const NullFieldsSearchReply& reply) { return reply.ToEncodableMap(); } }; @@ -194,12 +194,12 @@ TEST_F(NullFieldsTest, ReplyToMapWithValues) { EXPECT_EQ(map.size(), 5); EXPECT_EQ(*ExpectAndGet(map, "result"), "result"); EXPECT_EQ(*ExpectAndGet(map, "error"), "error"); - const EncodableList &indices = *ExpectAndGet(map, "indices"); + const EncodableList& indices = *ExpectAndGet(map, "indices"); EXPECT_EQ(indices.size(), 3); EXPECT_EQ(indices[0].LongValue(), 1L); EXPECT_EQ(indices[1].LongValue(), 2L); EXPECT_EQ(indices[2].LongValue(), 3L); - const EncodableMap &request_map = *ExpectAndGet(map, "request"); + const EncodableMap& request_map = *ExpectAndGet(map, "request"); EXPECT_EQ(*ExpectAndGet(request_map, "query"), "hello"); EXPECT_EQ(*ExpectAndGet(map, "type"), 0); } diff --git a/packages/pigeon/platform_tests/windows_unit_tests/windows/test/nullable_returns_test.cpp b/packages/pigeon/platform_tests/test_plugin/windows/test/nullable_returns_test.cpp similarity index 100% rename from packages/pigeon/platform_tests/windows_unit_tests/windows/test/nullable_returns_test.cpp rename to packages/pigeon/platform_tests/test_plugin/windows/test/nullable_returns_test.cpp diff --git a/packages/pigeon/platform_tests/windows_unit_tests/windows/test/pigeon_test.cpp b/packages/pigeon/platform_tests/test_plugin/windows/test/pigeon_test.cpp similarity index 89% rename from packages/pigeon/platform_tests/windows_unit_tests/windows/test/pigeon_test.cpp rename to packages/pigeon/platform_tests/test_plugin/windows/test/pigeon_test.cpp index 60c1f1f6355a..6ef04262cd6d 100644 --- a/packages/pigeon/platform_tests/windows_unit_tests/windows/test/pigeon_test.cpp +++ b/packages/pigeon/platform_tests/test_plugin/windows/test/pigeon_test.cpp @@ -11,9 +11,8 @@ #include #include "message.g.h" -#include "windows_unit_tests_plugin.h" -namespace windows_unit_tests { +namespace test_plugin { namespace test { namespace { @@ -80,18 +79,6 @@ class Writer : public flutter::ByteStreamWriter { }; } // namespace -TEST(PigeonTests, Placeholder) { - std::unique_ptr result = - std::make_unique(); - - // Expect a success response. - EXPECT_CALL(*result, SuccessInternal(Pointee(EncodableValue(true)))); - - WindowsUnitTestsPlugin plugin; - plugin.HandleMethodCall(flutter::MethodCall<>("placeholder", nullptr), - std::move(result)); -} - TEST(PigeonTests, CallInitialize) { MockBinaryMessenger mock_messenger; MockApi mock_api; @@ -148,4 +135,4 @@ TEST(PigeonTests, CallSearch) { } } // namespace test -} // namespace windows_unit_tests +} // namespace test_plugin diff --git a/packages/pigeon/platform_tests/windows_unit_tests/windows/test/primitive_test.cpp b/packages/pigeon/platform_tests/test_plugin/windows/test/primitive_test.cpp similarity index 100% rename from packages/pigeon/platform_tests/windows_unit_tests/windows/test/primitive_test.cpp rename to packages/pigeon/platform_tests/test_plugin/windows/test/primitive_test.cpp diff --git a/packages/pigeon/platform_tests/windows_unit_tests/windows/test/utils/echo_messenger.cpp b/packages/pigeon/platform_tests/test_plugin/windows/test/utils/echo_messenger.cpp similarity index 100% rename from packages/pigeon/platform_tests/windows_unit_tests/windows/test/utils/echo_messenger.cpp rename to packages/pigeon/platform_tests/test_plugin/windows/test/utils/echo_messenger.cpp diff --git a/packages/pigeon/platform_tests/windows_unit_tests/windows/test/utils/echo_messenger.h b/packages/pigeon/platform_tests/test_plugin/windows/test/utils/echo_messenger.h similarity index 81% rename from packages/pigeon/platform_tests/windows_unit_tests/windows/test/utils/echo_messenger.h rename to packages/pigeon/platform_tests/test_plugin/windows/test/utils/echo_messenger.h index 7bc462545a3d..5237ba470031 100644 --- a/packages/pigeon/platform_tests/windows_unit_tests/windows/test/utils/echo_messenger.h +++ b/packages/pigeon/platform_tests/test_plugin/windows/test/utils/echo_messenger.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef PLATFORM_TESTS_WINDOWS_UNIT_TESTS_WINDOWS_TEST_UTILS_ECHO_MESSENGER_H_ -#define PLATFORM_TESTS_WINDOWS_UNIT_TESTS_WINDOWS_TEST_UTILS_ECHO_MESSENGER_H_ +#ifndef PLATFORM_TESTS_TEST_PLUGIN_WINDOWS_TEST_UTILS_ECHO_MESSENGER_H_ +#define PLATFORM_TESTS_TEST_PLUGIN_WINDOWS_TEST_UTILS_ECHO_MESSENGER_H_ #include #include @@ -32,4 +32,4 @@ class EchoMessenger : public flutter::BinaryMessenger { } // namespace testing -#endif // PLATFORM_TESTS_WINDOWS_UNIT_TESTS_WINDOWS_TEST_UTILS_ECHO_MESSENGER_H_ +#endif // PLATFORM_TESTS_TEST_PLUGIN_WINDOWS_TEST_UTILS_ECHO_MESSENGER_H_ diff --git a/packages/pigeon/platform_tests/windows_unit_tests/windows/test/utils/fake_host_messenger.cpp b/packages/pigeon/platform_tests/test_plugin/windows/test/utils/fake_host_messenger.cpp similarity index 100% rename from packages/pigeon/platform_tests/windows_unit_tests/windows/test/utils/fake_host_messenger.cpp rename to packages/pigeon/platform_tests/test_plugin/windows/test/utils/fake_host_messenger.cpp diff --git a/packages/pigeon/platform_tests/windows_unit_tests/windows/test/utils/fake_host_messenger.h b/packages/pigeon/platform_tests/test_plugin/windows/test/utils/fake_host_messenger.h similarity index 86% rename from packages/pigeon/platform_tests/windows_unit_tests/windows/test/utils/fake_host_messenger.h rename to packages/pigeon/platform_tests/test_plugin/windows/test/utils/fake_host_messenger.h index fd3142669471..bb4f94f59029 100644 --- a/packages/pigeon/platform_tests/windows_unit_tests/windows/test/utils/fake_host_messenger.h +++ b/packages/pigeon/platform_tests/test_plugin/windows/test/utils/fake_host_messenger.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef PLATFORM_TESTS_WINDOWS_UNIT_TESTS_WINDOWS_TEST_UTILS_FAKE_HOST_MESSENGER_H_ -#define PLATFORM_TESTS_WINDOWS_UNIT_TESTS_WINDOWS_TEST_UTILS_FAKE_HOST_MESSENGER_H_ +#ifndef PLATFORM_TESTS_TEST_PLUGIN_WINDOWS_TEST_UTILS_FAKE_HOST_MESSENGER_H_ +#define PLATFORM_TESTS_TEST_PLUGIN_WINDOWS_TEST_UTILS_FAKE_HOST_MESSENGER_H_ #include #include @@ -48,4 +48,4 @@ class FakeHostMessenger : public flutter::BinaryMessenger { } // namespace testing -#endif // PLATFORM_TESTS_WINDOWS_UNIT_TESTS_WINDOWS_TEST_UTILS_FAKE_HOST_MESSENGER_H_ +#endif // PLATFORM_TESTS_TEST_PLUGIN_WINDOWS_TEST_UTILS_FAKE_HOST_MESSENGER_H_ diff --git a/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.cpp b/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.cpp index e56001b18609..219ae1cbee2d 100644 --- a/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.cpp +++ b/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.cpp @@ -5,33 +5,20 @@ #include "test_plugin.h" // This must be included before many other Windows headers. -#include - -// For getPlatformVersion; remove unless needed for your plugin implementation. -#include -#include #include -#include +#include #include -#include namespace test_plugin { // static void TestPlugin::RegisterWithRegistrar( flutter::PluginRegistrarWindows* registrar) { - auto channel = - std::make_unique>( - registrar->messenger(), "test_plugin", - &flutter::StandardMethodCodec::GetInstance()); - auto plugin = std::make_unique(); - channel->SetMethodCallHandler( - [plugin_pointer = plugin.get()](const auto& call, auto result) { - plugin_pointer->HandleMethodCall(call, std::move(result)); - }); + // This plugin is currently a no-op since only unit tests have been set up. + // In the future, this will register Pigeon APIs used in integration tests. registrar->AddPlugin(std::move(plugin)); } @@ -40,23 +27,4 @@ TestPlugin::TestPlugin() {} TestPlugin::~TestPlugin() {} -void TestPlugin::HandleMethodCall( - const flutter::MethodCall& method_call, - std::unique_ptr> result) { - if (method_call.method_name().compare("getPlatformVersion") == 0) { - std::ostringstream version_stream; - version_stream << "Windows "; - if (IsWindows10OrGreater()) { - version_stream << "10+"; - } else if (IsWindows8OrGreater()) { - version_stream << "8"; - } else if (IsWindows7OrGreater()) { - version_stream << "7"; - } - result->Success(flutter::EncodableValue(version_stream.str())); - } else { - result->NotImplemented(); - } -} - } // namespace test_plugin diff --git a/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.h b/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.h index 3a80d3f78408..b236b1ad19d6 100644 --- a/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.h +++ b/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.h @@ -23,12 +23,6 @@ class TestPlugin : public flutter::Plugin { // Disallow copy and assign. TestPlugin(const TestPlugin&) = delete; TestPlugin& operator=(const TestPlugin&) = delete; - - private: - // Called when a method is called on this plugin's channel from Dart. - void HandleMethodCall( - const flutter::MethodCall& method_call, - std::unique_ptr> result); }; } // namespace test_plugin diff --git a/packages/pigeon/platform_tests/windows_unit_tests/.clang-format b/packages/pigeon/platform_tests/windows_unit_tests/.clang-format deleted file mode 100644 index f6cb8ad931f5..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/.clang-format +++ /dev/null @@ -1 +0,0 @@ -BasedOnStyle: Google diff --git a/packages/pigeon/platform_tests/windows_unit_tests/.gitignore b/packages/pigeon/platform_tests/windows_unit_tests/.gitignore deleted file mode 100644 index 9be145fde98d..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/.gitignore +++ /dev/null @@ -1,29 +0,0 @@ -# Miscellaneous -*.class -*.log -*.pyc -*.swp -.DS_Store -.atom/ -.buildlog/ -.history -.svn/ - -# IntelliJ related -*.iml -*.ipr -*.iws -.idea/ - -# The .vscode folder contains launch configuration and tasks you configure in -# VS Code which you may wish to be included in version control, so this line -# is commented out by default. -#.vscode/ - -# Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -/pubspec.lock -**/doc/api/ -.dart_tool/ -.packages -build/ diff --git a/packages/pigeon/platform_tests/windows_unit_tests/.metadata b/packages/pigeon/platform_tests/windows_unit_tests/.metadata deleted file mode 100644 index 7293c1a44e37..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/.metadata +++ /dev/null @@ -1,10 +0,0 @@ -# This file tracks properties of this Flutter project. -# Used by Flutter tool to assess capabilities and perform upgrades etc. -# -# This file should be version controlled and should not be manually edited. - -version: - revision: e7ff92ec2bd5c3ac5b803013795d0dee582b2a6b - channel: windows-template-restructure - -project_type: plugin diff --git a/packages/pigeon/platform_tests/windows_unit_tests/CHANGELOG.md b/packages/pigeon/platform_tests/windows_unit_tests/CHANGELOG.md deleted file mode 100644 index 41cc7d8192ec..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/CHANGELOG.md +++ /dev/null @@ -1,3 +0,0 @@ -## 0.0.1 - -* TODO: Describe initial release. diff --git a/packages/pigeon/platform_tests/windows_unit_tests/LICENSE b/packages/pigeon/platform_tests/windows_unit_tests/LICENSE deleted file mode 100644 index c6823b81eb84..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/LICENSE +++ /dev/null @@ -1,25 +0,0 @@ -Copyright 2013 The Flutter Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of Google Inc. nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/packages/pigeon/platform_tests/windows_unit_tests/README.md b/packages/pigeon/platform_tests/windows_unit_tests/README.md deleted file mode 100644 index 9460316756e8..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# windows_unit_tests - -Unit-tests for Pigeon generated Windows C++ code. - -This is intended to be run with [run_tests.sh](../../run_tests.sh) -(not yet implemented). They can be run manually via: -```sh -cd example -flutter build windows --debug -build\windows\plugins\windows_unit_tests\Debug\windows_unit_tests_test.exe -``` - -Tests should be added to [`pigeon_test.cpp`](windows/test/pigeon_test.cpp). diff --git a/packages/pigeon/platform_tests/windows_unit_tests/example/.gitignore b/packages/pigeon/platform_tests/windows_unit_tests/example/.gitignore deleted file mode 100644 index 0fa6b675c0a5..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/example/.gitignore +++ /dev/null @@ -1,46 +0,0 @@ -# Miscellaneous -*.class -*.log -*.pyc -*.swp -.DS_Store -.atom/ -.buildlog/ -.history -.svn/ - -# IntelliJ related -*.iml -*.ipr -*.iws -.idea/ - -# The .vscode folder contains launch configuration and tasks you configure in -# VS Code which you may wish to be included in version control, so this line -# is commented out by default. -#.vscode/ - -# Flutter/Dart/Pub related -**/doc/api/ -**/ios/Flutter/.last_build_id -.dart_tool/ -.flutter-plugins -.flutter-plugins-dependencies -.packages -.pub-cache/ -.pub/ -/build/ - -# Web related -lib/generated_plugin_registrant.dart - -# Symbolication related -app.*.symbols - -# Obfuscation related -app.*.map.json - -# Android Studio will place build artifacts here -/android/app/debug -/android/app/profile -/android/app/release diff --git a/packages/pigeon/platform_tests/windows_unit_tests/example/.metadata b/packages/pigeon/platform_tests/windows_unit_tests/example/.metadata deleted file mode 100644 index 29feecbe9045..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/example/.metadata +++ /dev/null @@ -1,10 +0,0 @@ -# This file tracks properties of this Flutter project. -# Used by Flutter tool to assess capabilities and perform upgrades etc. -# -# This file should be version controlled and should not be manually edited. - -version: - revision: e7ff92ec2bd5c3ac5b803013795d0dee582b2a6b - channel: windows-template-restructure - -project_type: app diff --git a/packages/pigeon/platform_tests/windows_unit_tests/example/README.md b/packages/pigeon/platform_tests/windows_unit_tests/example/README.md deleted file mode 100644 index 2031ff696c2d..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/example/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# windows_unit_tests_example - -Serves as a build environment for the `windows_unit_tests` plugin; see -[its README](../README.md) for more. It is not intended to be run. diff --git a/packages/pigeon/platform_tests/windows_unit_tests/example/lib/main.dart b/packages/pigeon/platform_tests/windows_unit_tests/example/lib/main.dart deleted file mode 100644 index 31407af42095..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/example/lib/main.dart +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:windows_unit_tests/windows_unit_tests.dart'; - -// ignore_for_file: public_member_api_docs - -void main() { - runApp(const MyApp()); -} - -class MyApp extends StatefulWidget { - const MyApp({Key? key}) : super(key: key); - - @override - State createState() => _MyAppState(); -} - -class _MyAppState extends State { - bool _result = false; - - @override - void initState() { - super.initState(); - initPlatformState(); - } - - // Platform messages are asynchronous, so we initialize in an async method. - Future initPlatformState() async { - bool result; - // Platform messages may fail, so we use a try/catch PlatformException. - // We also handle the message potentially returning null. - try { - result = await WindowsUnitTests.checkPlaceholder ?? false; - } on PlatformException { - result = false; - } - - // If the widget was removed from the tree while the asynchronous platform - // message was in flight, we want to discard the reply rather than calling - // setState to update our non-existent appearance. - if (!mounted) { - return; - } - - setState(() { - _result = result; - }); - } - - @override - Widget build(BuildContext context) { - return MaterialApp( - home: Scaffold( - appBar: AppBar( - title: const Text('Plugin example app'), - ), - body: Center( - child: Text('Placeholder: $_result\n'), - ), - ), - ); - } -} diff --git a/packages/pigeon/platform_tests/windows_unit_tests/example/pubspec.yaml b/packages/pigeon/platform_tests/windows_unit_tests/example/pubspec.yaml deleted file mode 100644 index a866003a9691..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/example/pubspec.yaml +++ /dev/null @@ -1,25 +0,0 @@ -name: windows_unit_tests_example -description: Demonstrates how to use the windows_unit_tests plugin. -publish_to: 'none' - -environment: - sdk: ">=2.12.0 <3.0.0" - -dependencies: - flutter: - sdk: flutter - - windows_unit_tests: - # When depending on this package from a real application you should use: - # windows_unit_tests: ^x.y.z - # See https://dart.dev/tools/pub/dependencies#version-constraints - # The example app is bundled with the plugin so we use a path dependency on - # the parent directory to use the current plugin's version. - path: ../ - -dev_dependencies: - flutter_test: - sdk: flutter - -flutter: - uses-material-design: true diff --git a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/.gitignore b/packages/pigeon/platform_tests/windows_unit_tests/example/windows/.gitignore deleted file mode 100644 index d492d0d98c8f..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -flutter/ephemeral/ - -# Visual Studio user-specific files. -*.suo -*.user -*.userosscache -*.sln.docstates - -# Visual Studio build-related files. -x64/ -x86/ - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ diff --git a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/CMakeLists.txt b/packages/pigeon/platform_tests/windows_unit_tests/example/windows/CMakeLists.txt deleted file mode 100644 index aa8dfa22976e..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/CMakeLists.txt +++ /dev/null @@ -1,95 +0,0 @@ -cmake_minimum_required(VERSION 3.14) -project(windows_unit_tests_example LANGUAGES CXX) - -set(BINARY_NAME "windows_unit_tests_example") - -cmake_policy(SET CMP0063 NEW) - -set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") - -# Configure build options. -get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) -if(IS_MULTICONFIG) - set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" - CACHE STRING "" FORCE) -else() - if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) - set(CMAKE_BUILD_TYPE "Debug" CACHE - STRING "Flutter build mode" FORCE) - set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS - "Debug" "Profile" "Release") - endif() -endif() - -set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") -set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") -set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") -set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") - -# Use Unicode for all projects. -add_definitions(-DUNICODE -D_UNICODE) - -# Compilation settings that should be applied to most targets. -function(APPLY_STANDARD_SETTINGS TARGET) - target_compile_features(${TARGET} PUBLIC cxx_std_17) - target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") - target_compile_options(${TARGET} PRIVATE /EHsc) - target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") - target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") -endfunction() - -set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") - -# Flutter library and tool build rules. -add_subdirectory(${FLUTTER_MANAGED_DIR}) - -# Application build -add_subdirectory("runner") - -# Generated plugin build rules, which manage building the plugins and adding -# them to the application. -include(flutter/generated_plugins.cmake) - - -# === Installation === -# Support files are copied into place next to the executable, so that it can -# run in place. This is done instead of making a separate bundle (as on Linux) -# so that building and running from within Visual Studio will work. -set(BUILD_BUNDLE_DIR "$") -# Make the "install" step default, as it's required to run. -set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) -if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) -endif() - -set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") -set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") - -install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" - COMPONENT Runtime) - -install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" - COMPONENT Runtime) - -install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" - COMPONENT Runtime) - -if(PLUGIN_BUNDLED_LIBRARIES) - install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" - DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" - COMPONENT Runtime) -endif() - -# Fully re-copy the assets directory on each build to avoid having stale files -# from a previous install. -set(FLUTTER_ASSET_DIR_NAME "flutter_assets") -install(CODE " - file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") - " COMPONENT Runtime) -install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" - DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) - -# Install the AOT library on non-Debug builds only. -install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" - CONFIGURATIONS Profile;Release - COMPONENT Runtime) diff --git a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/flutter/CMakeLists.txt b/packages/pigeon/platform_tests/windows_unit_tests/example/windows/flutter/CMakeLists.txt deleted file mode 100644 index b2e4bd8d658b..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/flutter/CMakeLists.txt +++ /dev/null @@ -1,103 +0,0 @@ -cmake_minimum_required(VERSION 3.14) - -set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") - -# Configuration provided via flutter tool. -include(${EPHEMERAL_DIR}/generated_config.cmake) - -# TODO: Move the rest of this into files in ephemeral. See -# https://github.com/flutter/flutter/issues/57146. -set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") - -# === Flutter Library === -set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") - -# Published to parent scope for install step. -set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) -set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) -set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) -set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) - -list(APPEND FLUTTER_LIBRARY_HEADERS - "flutter_export.h" - "flutter_windows.h" - "flutter_messenger.h" - "flutter_plugin_registrar.h" - "flutter_texture_registrar.h" -) -list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") -add_library(flutter INTERFACE) -target_include_directories(flutter INTERFACE - "${EPHEMERAL_DIR}" -) -target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") -add_dependencies(flutter flutter_assemble) - -# === Wrapper === -list(APPEND CPP_WRAPPER_SOURCES_CORE - "core_implementations.cc" - "standard_codec.cc" -) -list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") -list(APPEND CPP_WRAPPER_SOURCES_PLUGIN - "plugin_registrar.cc" -) -list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") -list(APPEND CPP_WRAPPER_SOURCES_APP - "flutter_engine.cc" - "flutter_view_controller.cc" -) -list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") - -# Wrapper sources needed for a plugin. -add_library(flutter_wrapper_plugin STATIC - ${CPP_WRAPPER_SOURCES_CORE} - ${CPP_WRAPPER_SOURCES_PLUGIN} -) -apply_standard_settings(flutter_wrapper_plugin) -set_target_properties(flutter_wrapper_plugin PROPERTIES - POSITION_INDEPENDENT_CODE ON) -set_target_properties(flutter_wrapper_plugin PROPERTIES - CXX_VISIBILITY_PRESET hidden) -target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) -target_include_directories(flutter_wrapper_plugin PUBLIC - "${WRAPPER_ROOT}/include" -) -add_dependencies(flutter_wrapper_plugin flutter_assemble) - -# Wrapper sources needed for the runner. -add_library(flutter_wrapper_app STATIC - ${CPP_WRAPPER_SOURCES_CORE} - ${CPP_WRAPPER_SOURCES_APP} -) -apply_standard_settings(flutter_wrapper_app) -target_link_libraries(flutter_wrapper_app PUBLIC flutter) -target_include_directories(flutter_wrapper_app PUBLIC - "${WRAPPER_ROOT}/include" -) -add_dependencies(flutter_wrapper_app flutter_assemble) - -# === Flutter tool backend === -# _phony_ is a non-existent file to force this command to run every time, -# since currently there's no way to get a full input/output list from the -# flutter tool. -set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") -set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) -add_custom_command( - OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} - ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} - ${CPP_WRAPPER_SOURCES_APP} - ${PHONY_OUTPUT} - COMMAND ${CMAKE_COMMAND} -E env - ${FLUTTER_TOOL_ENVIRONMENT} - "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" - windows-x64 $ - VERBATIM -) -add_custom_target(flutter_assemble DEPENDS - "${FLUTTER_LIBRARY}" - ${FLUTTER_LIBRARY_HEADERS} - ${CPP_WRAPPER_SOURCES_CORE} - ${CPP_WRAPPER_SOURCES_PLUGIN} - ${CPP_WRAPPER_SOURCES_APP} -) diff --git a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/flutter/generated_plugins.cmake b/packages/pigeon/platform_tests/windows_unit_tests/example/windows/flutter/generated_plugins.cmake deleted file mode 100644 index ae87f49ecbe7..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/flutter/generated_plugins.cmake +++ /dev/null @@ -1,24 +0,0 @@ -# -# Generated file, do not edit. -# - -list(APPEND FLUTTER_PLUGIN_LIST - windows_unit_tests -) - -list(APPEND FLUTTER_FFI_PLUGIN_LIST -) - -set(PLUGIN_BUNDLED_LIBRARIES) - -foreach(plugin ${FLUTTER_PLUGIN_LIST}) - add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) - target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) - list(APPEND PLUGIN_BUNDLED_LIBRARIES $) - list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) -endforeach(plugin) - -foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) - add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) - list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) -endforeach(ffi_plugin) diff --git a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/CMakeLists.txt b/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/CMakeLists.txt deleted file mode 100644 index de2d8916b72b..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -cmake_minimum_required(VERSION 3.14) -project(runner LANGUAGES CXX) - -add_executable(${BINARY_NAME} WIN32 - "flutter_window.cpp" - "main.cpp" - "utils.cpp" - "win32_window.cpp" - "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" - "Runner.rc" - "runner.exe.manifest" -) -apply_standard_settings(${BINARY_NAME}) -target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") -target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) -target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") -add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/Runner.rc b/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/Runner.rc deleted file mode 100644 index 85b62fca8358..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/Runner.rc +++ /dev/null @@ -1,121 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#pragma code_page(65001) -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "winres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (United States) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""winres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_APP_ICON ICON "resources\\app_icon.ico" - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -#ifdef FLUTTER_BUILD_NUMBER -#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER -#else -#define VERSION_AS_NUMBER 1,0,0 -#endif - -#ifdef FLUTTER_BUILD_NAME -#define VERSION_AS_STRING #FLUTTER_BUILD_NAME -#else -#define VERSION_AS_STRING "1.0.0" -#endif - -VS_VERSION_INFO VERSIONINFO - FILEVERSION VERSION_AS_NUMBER - PRODUCTVERSION VERSION_AS_NUMBER - FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG - FILEFLAGS VS_FF_DEBUG -#else - FILEFLAGS 0x0L -#endif - FILEOS VOS__WINDOWS32 - FILETYPE VFT_APP - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", "com.example" "\0" - VALUE "FileDescription", "Demonstrates how to use the windows_unit_tests plugin." "\0" - VALUE "FileVersion", VERSION_AS_STRING "\0" - VALUE "InternalName", "windows_unit_tests_example" "\0" - VALUE "LegalCopyright", "Copyright (C) 2021 com.example. All rights reserved." "\0" - VALUE "OriginalFilename", "windows_unit_tests_example.exe" "\0" - VALUE "ProductName", "windows_unit_tests_example" "\0" - VALUE "ProductVersion", VERSION_AS_STRING "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1252 - END -END - -#endif // English (United States) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED diff --git a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/flutter_window.cpp b/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/flutter_window.cpp deleted file mode 100644 index 217bf9b69e67..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/flutter_window.cpp +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -#include "flutter_window.h" - -#include - -#include "flutter/generated_plugin_registrant.h" - -FlutterWindow::FlutterWindow(const flutter::DartProject& project) - : project_(project) {} - -FlutterWindow::~FlutterWindow() {} - -bool FlutterWindow::OnCreate() { - if (!Win32Window::OnCreate()) { - return false; - } - - RECT frame = GetClientArea(); - - // The size here must match the window dimensions to avoid unnecessary surface - // creation / destruction in the startup path. - flutter_controller_ = std::make_unique( - frame.right - frame.left, frame.bottom - frame.top, project_); - // Ensure that basic setup of the controller was successful. - if (!flutter_controller_->engine() || !flutter_controller_->view()) { - return false; - } - RegisterPlugins(flutter_controller_->engine()); - SetChildContent(flutter_controller_->view()->GetNativeWindow()); - return true; -} - -void FlutterWindow::OnDestroy() { - if (flutter_controller_) { - flutter_controller_ = nullptr; - } - - Win32Window::OnDestroy(); -} - -LRESULT -FlutterWindow::MessageHandler(HWND hwnd, UINT const message, - WPARAM const wparam, - LPARAM const lparam) noexcept { - // Give Flutter, including plugins, an opportunity to handle window messages. - if (flutter_controller_) { - std::optional result = - flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, - lparam); - if (result) { - return *result; - } - } - - switch (message) { - case WM_FONTCHANGE: - flutter_controller_->engine()->ReloadSystemFonts(); - break; - } - - return Win32Window::MessageHandler(hwnd, message, wparam, lparam); -} diff --git a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/flutter_window.h b/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/flutter_window.h deleted file mode 100644 index 7cbf3d3ebbb2..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/flutter_window.h +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -#ifndef RUNNER_FLUTTER_WINDOW_H_ -#define RUNNER_FLUTTER_WINDOW_H_ - -#include -#include - -#include - -#include "win32_window.h" - -// A window that does nothing but host a Flutter view. -class FlutterWindow : public Win32Window { - public: - // Creates a new FlutterWindow hosting a Flutter view running |project|. - explicit FlutterWindow(const flutter::DartProject& project); - virtual ~FlutterWindow(); - - protected: - // Win32Window: - bool OnCreate() override; - void OnDestroy() override; - LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, - LPARAM const lparam) noexcept override; - - private: - // The project to run. - flutter::DartProject project_; - - // The Flutter instance hosted by this window. - std::unique_ptr flutter_controller_; -}; - -#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/main.cpp b/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/main.cpp deleted file mode 100644 index 48b19d57c6d8..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/main.cpp +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -#include -#include -#include - -#include "flutter_window.h" -#include "utils.h" - -int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, - _In_ wchar_t *command_line, _In_ int show_command) { - // Attach to console when present (e.g., 'flutter run') or create a - // new console when running with a debugger. - if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { - CreateAndAttachConsole(); - } - - // Initialize COM, so that it is available for use in the library and/or - // plugins. - ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); - - flutter::DartProject project(L"data"); - - std::vector command_line_arguments = GetCommandLineArguments(); - - project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); - - FlutterWindow window(project); - Win32Window::Point origin(10, 10); - Win32Window::Size size(1280, 720); - if (!window.CreateAndShow(L"windows_unit_tests_example", origin, size)) { - return EXIT_FAILURE; - } - window.SetQuitOnClose(true); - - ::MSG msg; - while (::GetMessage(&msg, nullptr, 0, 0)) { - ::TranslateMessage(&msg); - ::DispatchMessage(&msg); - } - - ::CoUninitialize(); - return EXIT_SUCCESS; -} diff --git a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/resource.h b/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/resource.h deleted file mode 100644 index e9e479652e8f..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/resource.h +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by Runner.rc -// -#define IDI_APP_ICON 101 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 102 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/resources/app_icon.ico b/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/resources/app_icon.ico deleted file mode 100644 index c04e20caf637..000000000000 Binary files a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/resources/app_icon.ico and /dev/null differ diff --git a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/runner.exe.manifest b/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/runner.exe.manifest deleted file mode 100644 index c977c4a42589..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/runner.exe.manifest +++ /dev/null @@ -1,20 +0,0 @@ - - - - - PerMonitorV2 - - - - - - - - - - - - - - - diff --git a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/utils.cpp b/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/utils.cpp deleted file mode 100644 index 8b8eaa54539a..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/utils.cpp +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -#include "utils.h" - -#include -#include -#include -#include - -#include - -void CreateAndAttachConsole() { - if (::AllocConsole()) { - FILE* unused; - if (freopen_s(&unused, "CONOUT$", "w", stdout)) { - _dup2(_fileno(stdout), 1); - } - if (freopen_s(&unused, "CONOUT$", "w", stderr)) { - _dup2(_fileno(stdout), 2); - } - std::ios::sync_with_stdio(); - FlutterDesktopResyncOutputStreams(); - } -} - -std::vector GetCommandLineArguments() { - // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. - int argc; - wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); - if (argv == nullptr) { - return std::vector(); - } - - std::vector command_line_arguments; - - // Skip the first argument as it's the binary name. - for (int i = 1; i < argc; i++) { - command_line_arguments.push_back(Utf8FromUtf16(argv[i])); - } - - ::LocalFree(argv); - - return command_line_arguments; -} - -std::string Utf8FromUtf16(const wchar_t* utf16_string) { - if (utf16_string == nullptr) { - return std::string(); - } - int target_length = - ::WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, -1, - nullptr, 0, nullptr, nullptr); - if (target_length == 0) { - return std::string(); - } - std::string utf8_string; - utf8_string.resize(target_length); - int converted_length = ::WideCharToMultiByte( - CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, -1, utf8_string.data(), - target_length, nullptr, nullptr); - if (converted_length == 0) { - return std::string(); - } - return utf8_string; -} diff --git a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/utils.h b/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/utils.h deleted file mode 100644 index 6d1cc48f0426..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/utils.h +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -#ifndef RUNNER_UTILS_H_ -#define RUNNER_UTILS_H_ - -#include -#include - -// Creates a console for the process, and redirects stdout and stderr to -// it for both the runner and the Flutter library. -void CreateAndAttachConsole(); - -// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string -// encoded in UTF-8. Returns an empty std::string on failure. -std::string Utf8FromUtf16(const wchar_t* utf16_string); - -// Gets the command line arguments passed in as a std::vector, -// encoded in UTF-8. Returns an empty std::vector on failure. -std::vector GetCommandLineArguments(); - -#endif // RUNNER_UTILS_H_ diff --git a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/win32_window.cpp b/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/win32_window.cpp deleted file mode 100644 index 34738de2d35b..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/win32_window.cpp +++ /dev/null @@ -1,240 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -#include "win32_window.h" - -#include - -#include "resource.h" - -namespace { - -constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; - -// The number of Win32Window objects that currently exist. -static int g_active_window_count = 0; - -using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); - -// Scale helper to convert logical scaler values to physical using passed in -// scale factor -int Scale(int source, double scale_factor) { - return static_cast(source * scale_factor); -} - -// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. -// This API is only needed for PerMonitor V1 awareness mode. -void EnableFullDpiSupportIfAvailable(HWND hwnd) { - HMODULE user32_module = LoadLibraryA("User32.dll"); - if (!user32_module) { - return; - } - auto enable_non_client_dpi_scaling = - reinterpret_cast( - GetProcAddress(user32_module, "EnableNonClientDpiScaling")); - if (enable_non_client_dpi_scaling != nullptr) { - enable_non_client_dpi_scaling(hwnd); - FreeLibrary(user32_module); - } -} - -} // namespace - -// Manages the Win32Window's window class registration. -class WindowClassRegistrar { - public: - ~WindowClassRegistrar() = default; - - // Returns the singleton registar instance. - static WindowClassRegistrar* GetInstance() { - if (!instance_) { - instance_ = new WindowClassRegistrar(); - } - return instance_; - } - - // Returns the name of the window class, registering the class if it hasn't - // previously been registered. - const wchar_t* GetWindowClass(); - - // Unregisters the window class. Should only be called if there are no - // instances of the window. - void UnregisterWindowClass(); - - private: - WindowClassRegistrar() = default; - - static WindowClassRegistrar* instance_; - - bool class_registered_ = false; -}; - -WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; - -const wchar_t* WindowClassRegistrar::GetWindowClass() { - if (!class_registered_) { - WNDCLASS window_class{}; - window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); - window_class.lpszClassName = kWindowClassName; - window_class.style = CS_HREDRAW | CS_VREDRAW; - window_class.cbClsExtra = 0; - window_class.cbWndExtra = 0; - window_class.hInstance = GetModuleHandle(nullptr); - window_class.hIcon = - LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); - window_class.hbrBackground = 0; - window_class.lpszMenuName = nullptr; - window_class.lpfnWndProc = Win32Window::WndProc; - RegisterClass(&window_class); - class_registered_ = true; - } - return kWindowClassName; -} - -void WindowClassRegistrar::UnregisterWindowClass() { - UnregisterClass(kWindowClassName, nullptr); - class_registered_ = false; -} - -Win32Window::Win32Window() { ++g_active_window_count; } - -Win32Window::~Win32Window() { - --g_active_window_count; - Destroy(); -} - -bool Win32Window::CreateAndShow(const std::wstring& title, const Point& origin, - const Size& size) { - Destroy(); - - const wchar_t* window_class = - WindowClassRegistrar::GetInstance()->GetWindowClass(); - - const POINT target_point = {static_cast(origin.x), - static_cast(origin.y)}; - HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); - UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); - double scale_factor = dpi / 96.0; - - HWND window = CreateWindow( - window_class, title.c_str(), WS_OVERLAPPEDWINDOW | WS_VISIBLE, - Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), - Scale(size.width, scale_factor), Scale(size.height, scale_factor), - nullptr, nullptr, GetModuleHandle(nullptr), this); - - if (!window) { - return false; - } - - return OnCreate(); -} - -// static -LRESULT CALLBACK Win32Window::WndProc(HWND const window, UINT const message, - WPARAM const wparam, - LPARAM const lparam) noexcept { - if (message == WM_NCCREATE) { - auto window_struct = reinterpret_cast(lparam); - SetWindowLongPtr(window, GWLP_USERDATA, - reinterpret_cast(window_struct->lpCreateParams)); - - auto that = static_cast(window_struct->lpCreateParams); - EnableFullDpiSupportIfAvailable(window); - that->window_handle_ = window; - } else if (Win32Window* that = GetThisFromHandle(window)) { - return that->MessageHandler(window, message, wparam, lparam); - } - - return DefWindowProc(window, message, wparam, lparam); -} - -LRESULT -Win32Window::MessageHandler(HWND hwnd, UINT const message, WPARAM const wparam, - LPARAM const lparam) noexcept { - switch (message) { - case WM_DESTROY: - window_handle_ = nullptr; - Destroy(); - if (quit_on_close_) { - PostQuitMessage(0); - } - return 0; - - case WM_DPICHANGED: { - auto newRectSize = reinterpret_cast(lparam); - LONG newWidth = newRectSize->right - newRectSize->left; - LONG newHeight = newRectSize->bottom - newRectSize->top; - - SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, - newHeight, SWP_NOZORDER | SWP_NOACTIVATE); - - return 0; - } - case WM_SIZE: { - RECT rect = GetClientArea(); - if (child_content_ != nullptr) { - // Size and position the child window. - MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, - rect.bottom - rect.top, TRUE); - } - return 0; - } - - case WM_ACTIVATE: - if (child_content_ != nullptr) { - SetFocus(child_content_); - } - return 0; - } - - return DefWindowProc(window_handle_, message, wparam, lparam); -} - -void Win32Window::Destroy() { - OnDestroy(); - - if (window_handle_) { - DestroyWindow(window_handle_); - window_handle_ = nullptr; - } - if (g_active_window_count == 0) { - WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); - } -} - -Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { - return reinterpret_cast( - GetWindowLongPtr(window, GWLP_USERDATA)); -} - -void Win32Window::SetChildContent(HWND content) { - child_content_ = content; - SetParent(content, window_handle_); - RECT frame = GetClientArea(); - - MoveWindow(content, frame.left, frame.top, frame.right - frame.left, - frame.bottom - frame.top, true); - - SetFocus(child_content_); -} - -RECT Win32Window::GetClientArea() { - RECT frame; - GetClientRect(window_handle_, &frame); - return frame; -} - -HWND Win32Window::GetHandle() { return window_handle_; } - -void Win32Window::SetQuitOnClose(bool quit_on_close) { - quit_on_close_ = quit_on_close; -} - -bool Win32Window::OnCreate() { - // No-op; provided for subclasses. - return true; -} - -void Win32Window::OnDestroy() { - // No-op; provided for subclasses. -} diff --git a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/win32_window.h b/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/win32_window.h deleted file mode 100644 index 0f8bd1b7f920..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/example/windows/runner/win32_window.h +++ /dev/null @@ -1,98 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -#ifndef RUNNER_WIN32_WINDOW_H_ -#define RUNNER_WIN32_WINDOW_H_ - -#include - -#include -#include -#include - -// A class abstraction for a high DPI-aware Win32 Window. Intended to be -// inherited from by classes that wish to specialize with custom -// rendering and input handling -class Win32Window { - public: - struct Point { - unsigned int x; - unsigned int y; - Point(unsigned int x, unsigned int y) : x(x), y(y) {} - }; - - struct Size { - unsigned int width; - unsigned int height; - Size(unsigned int width, unsigned int height) - : width(width), height(height) {} - }; - - Win32Window(); - virtual ~Win32Window(); - - // Creates and shows a win32 window with |title| and position and size using - // |origin| and |size|. New windows are created on the default monitor. Window - // sizes are specified to the OS in physical pixels, hence to ensure a - // consistent size to will treat the width height passed in to this function - // as logical pixels and scale to appropriate for the default monitor. Returns - // true if the window was created successfully. - bool CreateAndShow(const std::wstring& title, const Point& origin, - const Size& size); - - // Release OS resources associated with window. - void Destroy(); - - // Inserts |content| into the window tree. - void SetChildContent(HWND content); - - // Returns the backing Window handle to enable clients to set icon and other - // window properties. Returns nullptr if the window has been destroyed. - HWND GetHandle(); - - // If true, closing this window will quit the application. - void SetQuitOnClose(bool quit_on_close); - - // Return a RECT representing the bounds of the current client area. - RECT GetClientArea(); - - protected: - // Processes and route salient window messages for mouse handling, - // size change and DPI. Delegates handling of these to member overloads that - // inheriting classes can handle. - virtual LRESULT MessageHandler(HWND window, UINT const message, - WPARAM const wparam, - LPARAM const lparam) noexcept; - - // Called when CreateAndShow is called, allowing subclass window-related - // setup. Subclasses should return false if setup fails. - virtual bool OnCreate(); - - // Called when Destroy is called. - virtual void OnDestroy(); - - private: - friend class WindowClassRegistrar; - - // OS callback called by message pump. Handles the WM_NCCREATE message which - // is passed when the non-client area is being created and enables automatic - // non-client DPI scaling so that the non-client area automatically - // responsponds to changes in DPI. All other messages are handled by - // MessageHandler. - static LRESULT CALLBACK WndProc(HWND const window, UINT const message, - WPARAM const wparam, - LPARAM const lparam) noexcept; - - // Retrieves a class instance pointer for |window| - static Win32Window* GetThisFromHandle(HWND const window) noexcept; - - bool quit_on_close_ = false; - - // window handle for top level window. - HWND window_handle_ = nullptr; - - // window handle for hosted content. - HWND child_content_ = nullptr; -}; - -#endif // RUNNER_WIN32_WINDOW_H_ diff --git a/packages/pigeon/platform_tests/windows_unit_tests/lib/windows_unit_tests.dart b/packages/pigeon/platform_tests/windows_unit_tests/lib/windows_unit_tests.dart deleted file mode 100644 index fb6a60397281..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/lib/windows_unit_tests.dart +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// ignore_for_file: public_member_api_docs - -import 'dart:async'; - -import 'package:flutter/services.dart'; - -// ignore: avoid_classes_with_only_static_members -class WindowsUnitTests { - static const MethodChannel _channel = MethodChannel('windows_unit_tests'); - - static Future get checkPlaceholder async { - final bool? result = await _channel.invokeMethod('placeholder'); - return result; - } -} diff --git a/packages/pigeon/platform_tests/windows_unit_tests/pubspec.yaml b/packages/pigeon/platform_tests/windows_unit_tests/pubspec.yaml deleted file mode 100644 index 077901b6c5b2..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/pubspec.yaml +++ /dev/null @@ -1,22 +0,0 @@ -name: windows_unit_tests -description: A new flutter plugin project. -version: 0.0.1 -publish_to: none - -environment: - sdk: ">=2.12.0 <3.0.0" - flutter: ">=2.10.0" - -flutter: - plugin: - platforms: - windows: - pluginClass: WindowsUnitTestsPluginCApi - -dependencies: - flutter: - sdk: flutter - -dev_dependencies: - flutter_test: - sdk: flutter diff --git a/packages/pigeon/platform_tests/windows_unit_tests/windows/.gitignore b/packages/pigeon/platform_tests/windows_unit_tests/windows/.gitignore deleted file mode 100644 index b3eb2be169a5..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/windows/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -flutter/ - -# Visual Studio user-specific files. -*.suo -*.user -*.userosscache -*.sln.docstates - -# Visual Studio build-related files. -x64/ -x86/ - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ diff --git a/packages/pigeon/platform_tests/windows_unit_tests/windows/CMakeLists.txt b/packages/pigeon/platform_tests/windows_unit_tests/windows/CMakeLists.txt deleted file mode 100644 index db289d07055a..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/windows/CMakeLists.txt +++ /dev/null @@ -1,114 +0,0 @@ -cmake_minimum_required(VERSION 3.14) -set(PROJECT_NAME "windows_unit_tests") -project(${PROJECT_NAME} LANGUAGES CXX) - -# This value is used when generating builds using this plugin, so it must -# not be changed -set(PLUGIN_NAME "windows_unit_tests_plugin") - -list(APPEND PLUGIN_SOURCES - "windows_unit_tests_plugin.cpp" - "windows_unit_tests_plugin.h" -) - -add_library(${PLUGIN_NAME} SHARED - "include/windows_unit_tests/windows_unit_tests_plugin_c_api.h" - "windows_unit_tests_plugin_c_api.cpp" - ${PLUGIN_SOURCES} -) -apply_standard_settings(${PLUGIN_NAME}) -set_target_properties(${PLUGIN_NAME} PROPERTIES - CXX_VISIBILITY_PRESET hidden) -target_compile_definitions(${PLUGIN_NAME} PRIVATE FLUTTER_PLUGIN_IMPL) -target_include_directories(${PLUGIN_NAME} INTERFACE - "${CMAKE_CURRENT_SOURCE_DIR}/include") -target_link_libraries(${PLUGIN_NAME} PRIVATE flutter flutter_wrapper_plugin) - -# List of absolute paths to libraries that should be bundled with the plugin -set(windows_unit_tests_bundled_libraries - "" - PARENT_SCOPE -) - -# === Tests === - -set(TEST_RUNNER "${PROJECT_NAME}_test") -enable_testing() -# TODO(stuartmorgan): Consider using a single shared, pre-checked-in googletest -# instance rather than downloading for each plugin. This approach makes sense -# for a template, but not for a monorepo with many plugins. -include(FetchContent) -FetchContent_Declare( - googletest - URL https://github.com/google/googletest/archive/release-1.11.0.zip -) -# Prevent overriding the parent project's compiler/linker settings -set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) -# Disable install commands for gtest so it doesn't end up in the bundle. -set(INSTALL_GTEST OFF CACHE BOOL "Disable installation of googletest" FORCE) - -FetchContent_MakeAvailable(googletest) - -# The plugin's C API is not very useful for unit testing, so build the sources -# directly into the test binary rather than using the DLL. -add_executable(${TEST_RUNNER} - # Tests. - test/multiple_arity_test.cpp - test/non_null_fields_test.cpp - test/nullable_returns_test.cpp - test/null_fields_test.cpp - test/pigeon_test.cpp - test/primitive_test.cpp - # Generated sources. - test/all_datatypes.g.cpp - test/all_datatypes.g.h - test/all_void.g.cpp - test/all_void.g.h - test/async_handlers.g.cpp - test/async_handlers.g.h - test/enum.g.cpp - test/enum.g.h - test/host2flutter.g.cpp - test/host2flutter.g.h - test/list.g.cpp - test/list.g.h - test/message.g.cpp - test/message.g.h - test/multiple_arity.g.cpp - test/multiple_arity.g.h - test/non_null_fields.g.cpp - test/non_null_fields.g.h - test/null_fields.g.cpp - test/null_fields.g.h - test/nullable_returns.g.cpp - test/nullable_returns.g.h - test/primitive.g.cpp - test/primitive.g.h - test/void_arg_flutter.g.cpp - test/void_arg_flutter.g.h - test/void_arg_host.g.cpp - test/void_arg_host.g.h - test/voidflutter.g.cpp - test/voidflutter.g.h - test/voidhost.g.cpp - test/voidhost.g.h - # Test utilities. - test/utils/echo_messenger.cpp - test/utils/echo_messenger.h - test/utils/fake_host_messenger.cpp - test/utils/fake_host_messenger.h - - ${PLUGIN_SOURCES} -) -apply_standard_settings(${TEST_RUNNER}) -target_include_directories(${TEST_RUNNER} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}") -target_link_libraries(${TEST_RUNNER} PRIVATE flutter_wrapper_plugin) -target_link_libraries(${TEST_RUNNER} PRIVATE gtest_main gmock) -# flutter_wrapper_plugin has link dependencies on the Flutter DLL. -add_custom_command(TARGET ${TEST_RUNNER} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - "${FLUTTER_LIBRARY}" $ -) - -include(GoogleTest) -gtest_discover_tests(${TEST_RUNNER}) diff --git a/packages/pigeon/platform_tests/windows_unit_tests/windows/include/windows_unit_tests/windows_unit_tests_plugin_c_api.h b/packages/pigeon/platform_tests/windows_unit_tests/windows/include/windows_unit_tests/windows_unit_tests_plugin_c_api.h deleted file mode 100644 index 39ccf58a125c..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/windows/include/windows_unit_tests/windows_unit_tests_plugin_c_api.h +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -#ifndef FLUTTER_PLUGIN_WINDOWS_UNIT_TESTS_PLUGIN_C_API_H_ -#define FLUTTER_PLUGIN_WINDOWS_UNIT_TESTS_PLUGIN_C_API_H_ - -#include - -#ifdef FLUTTER_PLUGIN_IMPL -#define FLUTTER_PLUGIN_EXPORT __declspec(dllexport) -#else -#define FLUTTER_PLUGIN_EXPORT __declspec(dllimport) -#endif - -#if defined(__cplusplus) -extern "C" { -#endif - -FLUTTER_PLUGIN_EXPORT void WindowsUnitTestsPluginCApiRegisterWithRegistrar( - FlutterDesktopPluginRegistrarRef registrar); - -#if defined(__cplusplus) -} // extern "C" -#endif - -#endif // FLUTTER_PLUGIN_WINDOWS_UNIT_TESTS_PLUGIN_C_API_H_ diff --git a/packages/pigeon/platform_tests/windows_unit_tests/windows/test/.gitignore b/packages/pigeon/platform_tests/windows_unit_tests/windows/test/.gitignore deleted file mode 100644 index 835726cb1232..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/windows/test/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.g.h -*.g.cpp diff --git a/packages/pigeon/platform_tests/windows_unit_tests/windows/windows_unit_tests_plugin.cpp b/packages/pigeon/platform_tests/windows_unit_tests/windows/windows_unit_tests_plugin.cpp deleted file mode 100644 index 3e592563cf3b..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/windows/windows_unit_tests_plugin.cpp +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -#include "windows_unit_tests_plugin.h" - -#include -#include -#include - -#include - -namespace windows_unit_tests { - -// static -void WindowsUnitTestsPlugin::RegisterWithRegistrar( - flutter::PluginRegistrarWindows *registrar) { - auto channel = - std::make_unique>( - registrar->messenger(), "windows_unit_tests", - &flutter::StandardMethodCodec::GetInstance()); - - auto plugin = std::make_unique(); - - channel->SetMethodCallHandler( - [plugin_pointer = plugin.get()](const auto &call, auto result) { - plugin_pointer->HandleMethodCall(call, std::move(result)); - }); - - registrar->AddPlugin(std::move(plugin)); -} - -WindowsUnitTestsPlugin::WindowsUnitTestsPlugin() {} - -WindowsUnitTestsPlugin::~WindowsUnitTestsPlugin() {} - -void WindowsUnitTestsPlugin::HandleMethodCall( - const flutter::MethodCall &method_call, - std::unique_ptr> result) { - if (method_call.method_name().compare("placeholder") == 0) { - result->Success(flutter::EncodableValue(true)); - } else { - result->NotImplemented(); - } -} - -} // namespace windows_unit_tests diff --git a/packages/pigeon/platform_tests/windows_unit_tests/windows/windows_unit_tests_plugin.h b/packages/pigeon/platform_tests/windows_unit_tests/windows/windows_unit_tests_plugin.h deleted file mode 100644 index a0d3e8b360f2..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/windows/windows_unit_tests_plugin.h +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -#ifndef FLUTTER_PLUGIN_WINDOWS_UNIT_TESTS_PLUGIN_H_ -#define FLUTTER_PLUGIN_WINDOWS_UNIT_TESTS_PLUGIN_H_ - -#include -#include - -#include - -namespace windows_unit_tests { - -class WindowsUnitTestsPlugin : public flutter::Plugin { - public: - static void RegisterWithRegistrar(flutter::PluginRegistrarWindows *registrar); - - WindowsUnitTestsPlugin(); - - virtual ~WindowsUnitTestsPlugin(); - - // Disallow copy and assign. - WindowsUnitTestsPlugin(const WindowsUnitTestsPlugin &) = delete; - WindowsUnitTestsPlugin &operator=(const WindowsUnitTestsPlugin &) = delete; - - // Called when a method is called on this plugin's channel from Dart. - void HandleMethodCall( - const flutter::MethodCall &method_call, - std::unique_ptr> result); -}; - -} // namespace windows_unit_tests - -#endif // FLUTTER_PLUGIN_WINDOWS_UNIT_TESTS_PLUGIN_H_ diff --git a/packages/pigeon/platform_tests/windows_unit_tests/windows/windows_unit_tests_plugin_c_api.cpp b/packages/pigeon/platform_tests/windows_unit_tests/windows/windows_unit_tests_plugin_c_api.cpp deleted file mode 100644 index b678f4be1c1d..000000000000 --- a/packages/pigeon/platform_tests/windows_unit_tests/windows/windows_unit_tests_plugin_c_api.cpp +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -#include "include/windows_unit_tests/windows_unit_tests_plugin_c_api.h" - -#include - -#include "windows_unit_tests_plugin.h" - -void WindowsUnitTestsPluginCApiRegisterWithRegistrar( - FlutterDesktopPluginRegistrarRef registrar) { - windows_unit_tests::WindowsUnitTestsPlugin::RegisterWithRegistrar( - flutter::PluginRegistrarManager::GetInstance() - ->GetRegistrar(registrar)); -} diff --git a/packages/pigeon/tool/run_tests.dart b/packages/pigeon/tool/run_tests.dart index 445744e23ad1..1c47e535ad8c 100644 --- a/packages/pigeon/tool/run_tests.dart +++ b/packages/pigeon/tool/run_tests.dart @@ -27,6 +27,8 @@ import 'package:meta/meta.dart'; const String _testFlag = 'test'; const String _listFlag = 'list'; +const String testPluginRelativePath = 'platform_tests/test_plugin'; + @immutable class _TestInfo { const _TestInfo({required this.function, this.description}); @@ -458,7 +460,7 @@ Future _runPigeon( } Future _runWindowsUnitTests() async { - const String windowsUnitTestsPath = './platform_tests/windows_unit_tests'; + const String windowsUnitTestsPath = './$testPluginRelativePath'; const List tests = [ 'all_datatypes', 'all_void', @@ -490,16 +492,17 @@ Future _runWindowsUnitTests() async { } } + const String examplePath = '$windowsUnitTestsPath/example'; final Process compile = await _streamOutput(Process.start( 'flutter', ['build', 'windows', '--debug'], - workingDirectory: '$windowsUnitTestsPath/example', runInShell: true)); + workingDirectory: examplePath, runInShell: true)); final int compileCode = await compile.exitCode; if (compileCode != 0) { return compileCode; } final Process run = await _streamOutput(Process.start( - '$windowsUnitTestsPath/example/build/windows/plugins/windows_unit_tests/Debug/windows_unit_tests_test.exe', + '$examplePath/build/windows/plugins/test_plugin/Debug/test_plugin_test.exe', [])); return run.exitCode;