forked from flutter/engine
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Makes android embedding to send full uri (flutter#41836)
related flutter/flutter#100624 [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
- Loading branch information
Showing
2 changed files
with
21 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -309,7 +309,7 @@ public void flutterEngineGroupGetsInitialRouteFromIntent() { | |
ArgumentCaptor<FlutterEngineGroup.Options> optionsCaptor = | ||
ArgumentCaptor.forClass(FlutterEngineGroup.Options.class); | ||
verify(flutterEngineGroup, times(1)).createAndRunEngine(optionsCaptor.capture()); | ||
assertEquals("/initial_route", optionsCaptor.getValue().getInitialRoute()); | ||
assertEquals("foo://example.com/initial_route", optionsCaptor.getValue().getInitialRoute()); | ||
} | ||
|
||
@Test | ||
|
@@ -688,7 +688,7 @@ public void itForwardsOnRequestPermissionsResultToFlutterEngine() { | |
|
||
// Verify that the navigation channel was given the initial route message. | ||
verify(mockFlutterEngine.getNavigationChannel(), times(1)) | ||
.setInitialRoute("/custom/route?query=test"); | ||
.setInitialRoute("http://myApp/custom/route?query=test"); | ||
} | ||
|
||
@Test | ||
|
@@ -716,7 +716,7 @@ public void itForwardsOnRequestPermissionsResultToFlutterEngine() { | |
|
||
// Verify that the navigation channel was given the initial route message. | ||
verify(mockFlutterEngine.getNavigationChannel(), times(1)) | ||
.setInitialRoute("/custom/route?query=test#fragment"); | ||
.setInitialRoute("http://myApp/custom/route?query=test#fragment"); | ||
} | ||
|
||
@Test | ||
|
@@ -744,7 +744,7 @@ public void itForwardsOnRequestPermissionsResultToFlutterEngine() { | |
|
||
// Verify that the navigation channel was given the initial route message. | ||
verify(mockFlutterEngine.getNavigationChannel(), times(1)) | ||
.setInitialRoute("/custom/route#fragment"); | ||
.setInitialRoute("http://myApp/custom/route#fragment"); | ||
} | ||
|
||
@Test | ||
|
@@ -771,7 +771,8 @@ public void itForwardsOnRequestPermissionsResultToFlutterEngine() { | |
delegate.onStart(); | ||
|
||
// Verify that the navigation channel was given the initial route message. | ||
verify(mockFlutterEngine.getNavigationChannel(), times(1)).setInitialRoute("/custom/route"); | ||
verify(mockFlutterEngine.getNavigationChannel(), times(1)) | ||
.setInitialRoute("http://myApp/custom/route"); | ||
} | ||
|
||
@Test | ||
|
@@ -809,19 +810,19 @@ public void itSendsPushRouteInformationMessageWhenOnNewIntent() { | |
// --- Execute the behavior under test --- | ||
// The FlutterEngine is set up in onAttach(). | ||
delegate.onAttach(ctx); | ||
String expected = "http://myApp/custom/route?query=test"; | ||
|
||
Intent mockIntent = mock(Intent.class); | ||
when(mockIntent.getData()).thenReturn(Uri.parse("http://myApp/custom/route?query=test")); | ||
when(mockIntent.getData()).thenReturn(Uri.parse(expected)); | ||
// Emulate the host and call the method that we expect to be forwarded. | ||
delegate.onNewIntent(mockIntent); | ||
|
||
// Verify that the navigation channel was given the push route message. | ||
verify(mockFlutterEngine.getNavigationChannel(), times(1)) | ||
.pushRouteInformation("/custom/route?query=test"); | ||
verify(mockFlutterEngine.getNavigationChannel(), times(1)).pushRouteInformation(expected); | ||
} | ||
|
||
@Test | ||
public void itDoesNotSendPushRouteInformationMessageWhenOnNewIntentIsNonHierarchicalUri() { | ||
public void itDoesSendPushRouteInformationMessageWhenOnNewIntentIsNonHierarchicalUri() { | ||
when(mockHost.shouldHandleDeeplinking()).thenReturn(true); | ||
// Create the real object that we're testing. | ||
FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost); | ||
|
@@ -839,7 +840,7 @@ public void itDoesNotSendPushRouteInformationMessageWhenOnNewIntentIsNonHierarch | |
delegate.onNewIntent(mockIntent); | ||
|
||
// Verify that the navigation channel was not given a push route message. | ||
verify(mockFlutterEngine.getNavigationChannel(), times(0)) | ||
verify(mockFlutterEngine.getNavigationChannel(), times(1)) | ||
.pushRouteInformation("mailto:[email protected]"); | ||
} | ||
|
||
|
@@ -852,16 +853,15 @@ public void itSendsPushRouteInformationMessageWhenOnNewIntentWithQueryParameterA | |
// --- Execute the behavior under test --- | ||
// The FlutterEngine is set up in onAttach(). | ||
delegate.onAttach(ctx); | ||
String expected = "http://myApp/custom/route?query=test#fragment"; | ||
|
||
Intent mockIntent = mock(Intent.class); | ||
when(mockIntent.getData()) | ||
.thenReturn(Uri.parse("http://myApp/custom/route?query=test#fragment")); | ||
when(mockIntent.getData()).thenReturn(Uri.parse(expected)); | ||
// Emulate the host and call the method that we expect to be forwarded. | ||
delegate.onNewIntent(mockIntent); | ||
|
||
// Verify that the navigation channel was given the push route message. | ||
verify(mockFlutterEngine.getNavigationChannel(), times(1)) | ||
.pushRouteInformation("/custom/route?query=test#fragment"); | ||
verify(mockFlutterEngine.getNavigationChannel(), times(1)).pushRouteInformation(expected); | ||
} | ||
|
||
@Test | ||
|
@@ -873,15 +873,15 @@ public void itSendsPushRouteInformationMessageWhenOnNewIntentWithFragmentNoQuery | |
// --- Execute the behavior under test --- | ||
// The FlutterEngine is set up in onAttach(). | ||
delegate.onAttach(ctx); | ||
String expected = "http://myApp/custom/route#fragment"; | ||
|
||
Intent mockIntent = mock(Intent.class); | ||
when(mockIntent.getData()).thenReturn(Uri.parse("http://myApp/custom/route#fragment")); | ||
when(mockIntent.getData()).thenReturn(Uri.parse(expected)); | ||
// Emulate the host and call the method that we expect to be forwarded. | ||
delegate.onNewIntent(mockIntent); | ||
|
||
// Verify that the navigation channel was given the push route message. | ||
verify(mockFlutterEngine.getNavigationChannel(), times(1)) | ||
.pushRouteInformation("/custom/route#fragment"); | ||
verify(mockFlutterEngine.getNavigationChannel(), times(1)).pushRouteInformation(expected); | ||
} | ||
|
||
@Test | ||
|
@@ -893,15 +893,15 @@ public void itSendsPushRouteInformationMessageWhenOnNewIntentNoQueryParameter() | |
// --- Execute the behavior under test --- | ||
// The FlutterEngine is set up in onAttach(). | ||
delegate.onAttach(ctx); | ||
String expected = "http://myApp/custom/route#fragment"; | ||
|
||
Intent mockIntent = mock(Intent.class); | ||
when(mockIntent.getData()).thenReturn(Uri.parse("http://myApp/custom/route")); | ||
when(mockIntent.getData()).thenReturn(Uri.parse(expected)); | ||
// Emulate the host and call the method that we expect to be forwarded. | ||
delegate.onNewIntent(mockIntent); | ||
|
||
// Verify that the navigation channel was given the push route message. | ||
verify(mockFlutterEngine.getNavigationChannel(), times(1)) | ||
.pushRouteInformation("/custom/route"); | ||
verify(mockFlutterEngine.getNavigationChannel(), times(1)).pushRouteInformation(expected); | ||
} | ||
|
||
@Test | ||
|