Skip to content

Improve code quality FlutterViewTest.java #178594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 1 commit into from
Nov 17, 2025
Merged

Improve code quality FlutterViewTest.java #178594

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions ...src/flutter/shell/platform/android/test/io/flutter/embedding/android/FlutterViewTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

import static junit.framework.TestCase.assertEquals;
import static junit.framework.TestCase.assertFalse;
import static junit.framework.TestCase.assertNotSame;
import static junit.framework.TestCase.assertNull;
import static junit.framework.TestCase.assertSame;
import static junit.framework.TestCase.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
Expand Down Expand Up @@ -164,12 +167,12 @@ public void detachFromFlutterEngine_removeImageView() {

flutterView.attachToFlutterEngine(flutterEngine);
flutterView.convertToImageView();
assertEquals(flutterView.getChildCount(), 2);
assertEquals(2, flutterView.getChildCount());
View view = flutterView.getChildAt(1);
assertTrue(view instanceof FlutterImageView);

flutterView.detachFromFlutterEngine();
assertEquals(flutterView.getChildCount(), 1);
assertEquals(1, flutterView.getChildCount());
view = flutterView.getChildAt(0);
assertFalse(view instanceof FlutterImageView);
}
Expand All @@ -189,13 +192,13 @@ public void detachFromFlutterEngine_closesImageView() {

flutterView.attachToFlutterEngine(flutterEngine);

assertFalse(flutterView.renderSurface == imageViewMock);
assertNotSame(flutterView.renderSurface, imageViewMock);

flutterView.convertToImageView();
assertTrue(flutterView.renderSurface == imageViewMock);
assertSame(flutterView.renderSurface, imageViewMock);

flutterView.detachFromFlutterEngine();
assertFalse(flutterView.renderSurface == imageViewMock);
assertNotSame(flutterView.renderSurface, imageViewMock);
verify(imageViewMock, times(1)).closeImageReader();
}

Expand All @@ -219,7 +222,7 @@ public void flutterImageView_revertImageViewAndAvoidNPE() {
assertFalse(flutterView.renderSurface instanceof FlutterImageView);

flutterView.detachFromFlutterEngine();
assertEquals(null, flutterView.getCurrentImageSurface());
assertNull(flutterView.getCurrentImageSurface());

// Invoke all registered `FlutterUiDisplayListener` callback
mockFlutterJni.onFirstFrame();
Expand All @@ -243,9 +246,6 @@ public void onConfigurationChanged_fizzlesWhenNullEngine() {
verify(flutterEngine, times(2)).getSettingsChannel();
}

@SuppressWarnings("deprecation")
// Robolectric.setupActivity
// TODO(reidbaker): https://github.com/flutter/flutter/issues/133151
@Test
public void onConfigurationChanged_notifiesEngineOfDisplaySize() {
try (ActivityScenario<Activity> scenario = ActivityScenario.launch(Activity.class)) {
Expand Down Expand Up @@ -1066,7 +1066,7 @@ public void findViewByAccessibilityIdTraversal_returnsRootViewOnAndroid29() thro
Method getAccessibilityViewIdMethod = View.class.getDeclaredMethod("getAccessibilityViewId");
Integer accessibilityViewId = (Integer) getAccessibilityViewIdMethod.invoke(flutterView);

assertEquals(null, flutterView.findViewByAccessibilityIdTraversal(accessibilityViewId));
assertNull(flutterView.findViewByAccessibilityIdTraversal(accessibilityViewId));
}

@Test
Expand Down