diff options
| author | Juan C Nuno <juancnuno@google.com> | 2022-07-18 15:36:18 -0700 |
|---|---|---|
| committer | Juan Nuno <juancnuno@google.com> | 2022-07-19 19:01:58 +0000 |
| commit | 8ce8ca66b1c0a4c34f94a6313a9ab814b498b8df (patch) | |
| tree | 080b86c3b15c4fc732b9fbc15828a11f390b03e9 | |
| parent | 19ae5661817fa0333c0f21d190be0bd6bc1a1131 (diff) | |
| download | idea-8ce8ca66b1c0a4c34f94a6313a9ab814b498b8df.tar.gz | |
Close the console
Bug: 237668331
Test: VirtualDeviceTableModelTest
Change-Id: I47098c07aa93c7e50f166efabc2cd4972afee59e
2 files changed, 10 insertions, 2 deletions
diff --git a/device-manager/src/com/android/tools/idea/devicemanager/virtualtab/VirtualDeviceTableModel.java b/device-manager/src/com/android/tools/idea/devicemanager/virtualtab/VirtualDeviceTableModel.java index cae093649c6..62d7de57f1b 100644 --- a/device-manager/src/com/android/tools/idea/devicemanager/virtualtab/VirtualDeviceTableModel.java +++ b/device-manager/src/com/android/tools/idea/devicemanager/virtualtab/VirtualDeviceTableModel.java @@ -386,7 +386,11 @@ final class VirtualDeviceTableModel extends AbstractTableModel { " emulator window."); } - myGetConsole.apply(d).kill(); + EmulatorConsole console = myGetConsole.apply(d); + + console.kill(); + console.close(); + return null; } diff --git a/device-manager/testSrc/com/android/tools/idea/devicemanager/virtualtab/VirtualDeviceTableModelTest.java b/device-manager/testSrc/com/android/tools/idea/devicemanager/virtualtab/VirtualDeviceTableModelTest.java index 3e72844fb0a..26085a9bcb9 100644 --- a/device-manager/testSrc/com/android/tools/idea/devicemanager/virtualtab/VirtualDeviceTableModelTest.java +++ b/device-manager/testSrc/com/android/tools/idea/devicemanager/virtualtab/VirtualDeviceTableModelTest.java @@ -45,6 +45,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; import org.mockito.ArgumentMatcher; import org.mockito.ArgumentMatchers; +import org.mockito.InOrder; import org.mockito.Mockito; @RunWith(JUnit4.class) @@ -265,7 +266,10 @@ public final class VirtualDeviceTableModelTest { TableModelEvent event = new TableModelEvent(model, 0, 0, VirtualDeviceTableModel.LAUNCH_OR_STOP_MODEL_COLUMN_INDEX); Mockito.verify(myListener).tableChanged(ArgumentMatchers.argThat(new TableModelEventArgumentMatcher(event))); - Mockito.verify(console).kill(); + InOrder inOrder = Mockito.inOrder(console); + + inOrder.verify(console).kill(); + inOrder.verify(console).close(); } private static @NotNull FutureCallback<@Nullable Object> newSetAllOnline(@NotNull VirtualDeviceTableModel model, |