|
2 | 2 | // Use of this source code is governed by a BSD-style license that can be
|
3 | 3 | // found in the LICENSE file.
|
4 | 4 |
|
| 5 | +#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterMenuPlugin.h" |
| 6 | +#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterMenuPlugin_Internal.h" |
| 7 | + |
| 8 | +#import "flutter/shell/platform/common/platform_provided_menu.h" |
| 9 | +#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h" |
5 | 10 | #import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterPluginMacOS.h"
|
6 | 11 | #import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterPluginRegistrarMacOS.h"
|
7 | 12 | #import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterViewController.h"
|
8 | 13 | #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h"
|
9 | 14 | #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h"
|
10 |
| -#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterMenuPlugin.h" |
11 |
| -#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterMenuPlugin_Internal.h" |
| 15 | +#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputPlugin.h" |
12 | 16 | #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObject.h"
|
13 | 17 | #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController_Internal.h"
|
14 |
| - |
15 |
| -#include "flutter/shell/platform/common/platform_provided_menu.h" |
| 18 | +#include "flutter/testing/autoreleasepool_test.h" |
| 19 | +#include "flutter/testing/testing.h" |
16 | 20 | #include "gtest/gtest.h"
|
17 | 21 |
|
18 |
| -#import <OCMock/OCMock.h> |
19 |
| -#import "flutter/testing/testing.h" |
| 22 | +@interface FakePluginRegistrar : NSObject <FlutterPluginRegistrar> |
| 23 | +@property(nonatomic, readonly) id<FlutterPlugin> plugin; |
| 24 | +@property(nonatomic, readonly) FlutterMethodChannel* channel; |
| 25 | +@end |
| 26 | + |
| 27 | +@implementation FakePluginRegistrar |
| 28 | +@synthesize messenger; |
| 29 | +@synthesize textures; |
| 30 | +@synthesize view; |
| 31 | + |
| 32 | +- (void)addMethodCallDelegate:(nonnull id<FlutterPlugin>)delegate |
| 33 | + channel:(nonnull FlutterMethodChannel*)channel { |
| 34 | + _plugin = delegate; |
| 35 | + _channel = channel; |
| 36 | + [_channel setMethodCallHandler:^(FlutterMethodCall* call, FlutterResult result) { |
| 37 | + [delegate handleMethodCall:call result:result]; |
| 38 | + }]; |
| 39 | +} |
| 40 | + |
| 41 | +- (void)addApplicationDelegate:(nonnull NSObject<FlutterAppLifecycleDelegate>*)delegate { |
| 42 | +} |
| 43 | + |
| 44 | +- (void)registerViewFactory:(nonnull NSObject<FlutterPlatformViewFactory>*)factory |
| 45 | + withId:(nonnull NSString*)factoryId { |
| 46 | +} |
20 | 47 |
|
21 |
| -@interface FlutterMenuPluginTestObjc : NSObject |
22 |
| -- (bool)testSetMenu; |
| 48 | +- (void)publish:(nonnull NSObject*)value { |
| 49 | +} |
| 50 | + |
| 51 | +- (nonnull NSString*)lookupKeyForAsset:(nonnull NSString*)asset { |
| 52 | + return @""; |
| 53 | +} |
| 54 | + |
| 55 | +- (nonnull NSString*)lookupKeyForAsset:(nonnull NSString*)asset |
| 56 | + fromPackage:(nonnull NSString*)package { |
| 57 | + return @""; |
| 58 | +} |
23 | 59 | @end
|
24 | 60 |
|
25 |
| -@implementation FlutterMenuPluginTestObjc |
| 61 | +namespace flutter::testing { |
26 | 62 |
|
27 |
| -- (bool)testSetMenu { |
28 |
| - // Workaround to deflake the test. |
29 |
| - // See: https://github.com/flutter/flutter/issues/104748#issuecomment-1159336728 |
30 |
| - NSView* view = [[NSView alloc] initWithFrame:NSZeroRect]; |
31 |
| - view.wantsLayer = YES; |
| 63 | +// FlutterMenuPluginTest is an AutoreleasePoolTest that allocates an NSView. |
| 64 | +// |
| 65 | +// This supports the use of NSApplication features that rely on the assumption of a view, such as |
| 66 | +// when modifying the application menu bar, or even accessing the NSApplication.localizedName |
| 67 | +// property. |
| 68 | +// |
| 69 | +// See: https://github.com/flutter/flutter/issues/104748#issuecomment-1159336728 |
| 70 | +class FlutterMenuPluginTest : public AutoreleasePoolTest { |
| 71 | + public: |
| 72 | + FlutterMenuPluginTest(); |
| 73 | + ~FlutterMenuPluginTest() = default; |
| 74 | + |
| 75 | + private: |
| 76 | + NSView* view_; |
| 77 | +}; |
| 78 | + |
| 79 | +FlutterMenuPluginTest::FlutterMenuPluginTest() { |
| 80 | + view_ = [[NSView alloc] initWithFrame:NSZeroRect]; |
| 81 | + view_.wantsLayer = YES; |
| 82 | +} |
32 | 83 |
|
| 84 | +TEST_F(FlutterMenuPluginTest, TestSetMenu) { |
33 | 85 | // Build a simulation of the default main menu.
|
34 | 86 | NSMenu* mainMenu = [[NSMenu alloc] init];
|
35 |
| - NSMenuItem* appNameMenu = [[NSMenuItem alloc] initWithTitle:@"APP_NAME" |
| 87 | + NSMenuItem* appNameMenu = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"APP_NAME", nil) |
36 | 88 | action:nil
|
37 | 89 | keyEquivalent:@""];
|
38 |
| - NSMenu* submenu = [[NSMenu alloc] initWithTitle:@"Prexisting APP_NAME menu"]; |
39 |
| - [submenu addItem:[[NSMenuItem alloc] initWithTitle:@"About APP_NAME" |
| 90 | + NSMenu* submenu = |
| 91 | + [[NSMenu alloc] initWithTitle:NSLocalizedString(@"Prexisting APP_NAME menu", nil)]; |
| 92 | + [submenu addItem:[[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"About APP_NAME", nil) |
40 | 93 | action:nil
|
41 | 94 | keyEquivalent:@""]];
|
42 | 95 | appNameMenu.submenu = submenu;
|
43 | 96 | [mainMenu addItem:appNameMenu];
|
44 | 97 | [NSApp setMainMenu:mainMenu];
|
45 | 98 |
|
46 |
| - id<FlutterPluginRegistrar> pluginRegistrarMock = |
47 |
| - OCMProtocolMock(@protocol(FlutterPluginRegistrar)); |
48 |
| - __block FlutterMethodChannel* pluginChannel; |
49 |
| - __block FlutterMenuPlugin* plugin; |
50 |
| - id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger)); |
51 |
| - OCMStub([pluginRegistrarMock messenger]).andReturn(binaryMessengerMock); |
52 |
| - OCMStub( // NOLINT(google-objc-avoid-throwing-exception) |
53 |
| - [pluginRegistrarMock addMethodCallDelegate:[OCMArg any] channel:[OCMArg any]]) |
54 |
| - .andDo(^(NSInvocation* invocation) { |
55 |
| - id<FlutterPlugin> delegate; |
56 |
| - FlutterMethodChannel* channel; |
57 |
| - [invocation getArgument:&delegate atIndex:2]; |
58 |
| - [invocation getArgument:&channel atIndex:3]; |
59 |
| - pluginChannel = channel; |
60 |
| - plugin = delegate; |
61 |
| - [channel setMethodCallHandler:^(FlutterMethodCall* call, FlutterResult result) { |
62 |
| - [delegate handleMethodCall:call result:result]; |
63 |
| - }]; |
64 |
| - }); |
65 |
| - [FlutterMenuPlugin registerWithRegistrar:pluginRegistrarMock]; |
| 99 | + FakePluginRegistrar* registrar = [[FakePluginRegistrar alloc] init]; |
| 100 | + [FlutterMenuPlugin registerWithRegistrar:registrar]; |
| 101 | + FlutterMenuPlugin* plugin = [registrar plugin]; |
66 | 102 |
|
67 | 103 | NSDictionary* testMenus = @{
|
68 | 104 | @"0" : @[
|
@@ -173,14 +209,6 @@ - (bool)testSetMenu {
|
173 | 209 | EXPECT_TRUE(
|
174 | 210 | [NSStringFromSelector([secondMenuLast action]) isEqualToString:@"flutterMenuItemSelected:"]);
|
175 | 211 | EXPECT_EQ([secondMenuLast tag], 7);
|
176 |
| - |
177 |
| - return true; |
178 | 212 | }
|
179 | 213 |
|
180 |
| -@end |
181 |
| - |
182 |
| -namespace flutter::testing { |
183 |
| -TEST(FlutterMenuPluginTest, TestSetMenu) { |
184 |
| - ASSERT_TRUE([[FlutterMenuPluginTestObjc alloc] testSetMenu]); |
185 |
| -} |
186 | 214 | } // namespace flutter::testing
|
0 commit comments