Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 349e309

Browse files
committed
finalized
1 parent d695636 commit 349e309

File tree

4 files changed

+16
-37
lines changed

4 files changed

+16
-37
lines changed

shell/platform/windows/BUILD.gn

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -112,42 +112,13 @@ executable("flutter_windows_unittests") {
112112
"win32_window_unittests.cc",
113113
"testing/win32_flutter_window_test.h",
114114
"testing/win32_flutter_window_test.cc",
115-
"angle_surface_manager.cc",
116-
"angle_surface_manager.h",
117-
"flutter_windows.cc",
118-
"key_event_handler.cc",
119-
"key_event_handler.h",
120-
"keyboard_hook_handler.h",
121-
"platform_handler.cc",
122-
"platform_handler.h",
123-
"text_input_plugin.cc",
124-
"text_input_plugin.h",
125-
"win32_dpi_helper.cc",
126-
"win32_dpi_helper.h",
127-
"win32_flutter_window.cc",
128-
"win32_flutter_window.h",
129-
"win32_window.cc",
130-
"win32_window.h",
131-
"window_state.h",
132115
]
133116

134-
defines = [ "USE_RAPID_JSON" ]
135-
136-
configs += [
137-
"$flutter_root/shell/platform/common/cpp:desktop_library_implementation",
138-
"//third_party/angle:gl_prototypes",
139-
]
140-
141-
public_configs = [ ":relative_angle_headers" ]
117+
public_configs = [ "$flutter_root:config" ]
142118

143119
deps = [
120+
":flutter_windows_source",
144121
":flutter_windows_headers",
145-
"$flutter_root/shell/platform/common/cpp:common_cpp",
146-
"$flutter_root/shell/platform/common/cpp/client_wrapper:client_wrapper",
147-
"$flutter_root/shell/platform/embedder:embedder_with_symbol_prefix",
148-
"$flutter_root/shell/platform/windows/client_wrapper:client_wrapper_windows",
149-
"//third_party/angle:libEGL_static", # the order of libEGL_static and libGLESv2_static is important.. if reversed, will cause a linker error DllMain already defined in LIBCMTD.lib
150-
"//third_party/angle:libGLESv2_static",
151122
"//third_party/rapidjson",
152123
":flutter_windows_fixtures",
153124
"$flutter_root/testing",

shell/platform/windows/testing/win32_flutter_window_test.cc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33

44
namespace flutter {
55
namespace testing {
6+
7+
Win32FlutterWindowTest::Win32FlutterWindowTest(int width, int height)
8+
: Win32FlutterWindow(width, height) {};
9+
10+
Win32FlutterWindowTest::~Win32FlutterWindowTest() = default;
11+
612
void Win32FlutterWindowTest::OnFontChange() {
713
on_font_change_called_ = true;
814
}

shell/platform/windows/testing/win32_flutter_window_test.h

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,29 @@
44

55
#include <windowsx.h>
66

7+
#include "flutter/fml/macros.h"
78
#include "flutter/shell/platform/windows/win32_flutter_window.h"
89

910
namespace flutter {
1011
namespace testing {
1112

1213
class Win32FlutterWindowTest : public Win32FlutterWindow {
1314
public:
14-
Win32FlutterWindowTest(int width, int height)
15-
: Win32FlutterWindow(width, height){};
15+
16+
Win32FlutterWindowTest(int width, int height);
17+
18+
~Win32FlutterWindowTest();
1619

1720
// |Win32Window|
1821
void OnFontChange() override;
1922

2023
bool OnFontChangeWasCalled();
2124

2225
private:
26+
2327
bool on_font_change_called_ = false;
28+
29+
FML_DISALLOW_COPY_AND_ASSIGN(Win32FlutterWindowTest);
2430
};
2531

2632
} // namespace testing

testing/run_tests.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,6 @@ def RunEngineExecutable(build_dir, executable_name, filter, flags=[], cwd=buildr
6565
print 'Running %s in %s' % (executable_name, cwd)
6666
test_command = [ executable ] + flags
6767
print ' '.join(test_command)
68-
# from subprocess import Popen, PIPE, STDOUT
69-
# p = Popen(test_command, cwd=cwd, shell=True, stdin=PIPE, stdout=PIPE, stderr=STDOUT)
70-
# output = p.stdout.read()
71-
# print output
7268
subprocess.check_call(test_command, cwd=cwd)
7369

7470

0 commit comments

Comments
 (0)