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

[webview_flutter] Refactored creation of Android WebView for testability. #4178

Merged
fluttergithubbot merged 7 commits into from
Jul 22, 2021
Merged

[webview_flutter] Refactored creation of Android WebView for testability. #4178

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5d04311
Refactor for testability
mvanbeusekom Jul 21, 2021
c026f9d
Test FlutterWebView.createWebView method
mvanbeusekom Jul 22, 2021
9bce993
Fixed formatting
mvanbeusekom Jul 22, 2021
da1b1c3
Add missing license header
mvanbeusekom Jul 22, 2021
953189d
Processed PR feedback
mvanbeusekom Jul 22, 2021
2c15ee0
Fixed formatting
mvanbeusekom Jul 22, 2021
b2b72a2
Fixed formatting
mvanbeusekom Jul 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed formatting
  • Loading branch information
@mvanbeusekom
mvanbeusekom committed Jul 22, 2021
commit 9bce993f6dc1d795e2cf529f843208f55d2b69d6
3 changes: 2 additions & 1 deletion ...flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ public void onAttachedToEngine(FlutterPluginBinding binding) {
binding
.getPlatformViewRegistry()
.registerViewFactory(
"plugins.flutter.io/webview", new FlutterWebViewFactory(messenger, /*containerView=*/ null));
"plugins.flutter.io/webview",
new FlutterWebViewFactory(messenger, /*containerView=*/ null));
flutterCookieManager = new FlutterCookieManager(messenger);
}

Expand Down
6 changes: 4 additions & 2 deletions ...w_flutter/android/src/test/java/io/flutter/plugins/webviewflutter/FlutterWebViewTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@ public void before() {
mockWebView = mock(WebView.class);

when(mockWebViewBuilder.setDomStorageEnabled(anyBoolean())).thenReturn(mockWebViewBuilder);
when(mockWebViewBuilder.setJavaScriptCanOpenWindowsAutomatically(anyBoolean())).thenReturn(mockWebViewBuilder);
when(mockWebViewBuilder.setJavaScriptCanOpenWindowsAutomatically(anyBoolean()))
.thenReturn(mockWebViewBuilder);
when(mockWebViewBuilder.setSupportMultipleWindows(anyBoolean())).thenReturn(mockWebViewBuilder);
when(mockWebViewBuilder.setUsesHybridComposition(anyBoolean())).thenReturn(mockWebViewBuilder);
when(mockWebViewBuilder.setWebChromeClient(any(WebChromeClient.class))).thenReturn(mockWebViewBuilder);
when(mockWebViewBuilder.setWebChromeClient(any(WebChromeClient.class)))
.thenReturn(mockWebViewBuilder);

when(mockWebViewBuilder.build()).thenReturn(mockWebView);
}
Expand Down
15 changes: 9 additions & 6 deletions ...w_flutter/android/src/test/java/io/flutter/plugins/webviewflutter/WebViewBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,15 @@ public void before() {
mockWebView = mock(WebView.class);
mockedStaticWebViewFactory = mockStatic(WebViewFactory.class);

mockedStaticWebViewFactory.when(new Verification() {
@Override
public void apply() {
WebViewFactory.create(mockContext, false, mockContainerView);
}
}).thenReturn(mockWebView);
mockedStaticWebViewFactory
.when(
new Verification() {
@Override
public void apply() {
WebViewFactory.create(mockContext, false, mockContainerView);
}
})
.thenReturn(mockWebView);
}

@After
Expand Down