[Device Manager] Add menu separator after pairing

Fixes: 222483339
Test: VirtualDevicePopUpMenuButtonTableCellEditorTest
Change-Id: I3a3925b0b32c79fc94b83776194f1f91d16ff74f

2 files changed, 11 insertions, 6 deletions

diff --git a/device-manager/src/com/android/tools/idea/devicemanager/virtualtab/VirtualDevicePopUpMenuButtonTableCellEditor.java b/device-manager/src/com/android/tools/idea/devicemanager/virtualtab/VirtualDevicePopUpMenuButtonTableCellEditor.java
index 009ba71c7df..64a1acb9026 100644
--- a/device-manager/src/com/android/tools/idea/devicemanager/virtualtab/VirtualDevicePopUpMenuButtonTableCellEditor.java
+++ b/device-manager/src/com/android/tools/idea/devicemanager/virtualtab/VirtualDevicePopUpMenuButtonTableCellEditor.java
@@ -150,6 +150,7 @@ final class VirtualDevicePopUpMenuButtonTableCellEditor extends PopUpMenuButtonT
       case WEAR_OS:
         items.add(newPairDeviceItem());
         newUnpairDeviceItem(EventKind.VIRTUAL_UNPAIR_DEVICE_ACTION).ifPresent(items::add);
+        items.add(new Separator());
 
         break;
       default:
diff --git a/device-manager/testSrc/com/android/tools/idea/devicemanager/virtualtab/VirtualDevicePopUpMenuButtonTableCellEditorTest.java b/device-manager/testSrc/com/android/tools/idea/devicemanager/virtualtab/VirtualDevicePopUpMenuButtonTableCellEditorTest.java
index bc243066eb1..54c0a3901e8 100644
--- a/device-manager/testSrc/com/android/tools/idea/devicemanager/virtualtab/VirtualDevicePopUpMenuButtonTableCellEditorTest.java
+++ b/device-manager/testSrc/com/android/tools/idea/devicemanager/virtualtab/VirtualDevicePopUpMenuButtonTableCellEditorTest.java
@@ -29,6 +29,7 @@ import java.util.Collection;
 import java.util.List;
 import javax.swing.AbstractButton;
 import javax.swing.JComponent;
+import javax.swing.JPopupMenu.Separator;
 import javax.swing.JTable;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
@@ -53,7 +54,7 @@ public final class VirtualDevicePopUpMenuButtonTableCellEditorTest {
     Collection<JComponent> items = myEditor.newItems();
 
     // Assert
-    assertEquals(7, items.size());
+    assertEquals(8, items.size());
   }
 
   @Test
@@ -68,7 +69,7 @@ public final class VirtualDevicePopUpMenuButtonTableCellEditorTest {
     List<JComponent> items = myEditor.newItems();
 
     // Assert
-    assertEquals(8, items.size());
+    assertEquals(9, items.size());
 
     AbstractButton item = (AbstractButton)items.get(2);
 
@@ -94,7 +95,7 @@ public final class VirtualDevicePopUpMenuButtonTableCellEditorTest {
     List<JComponent> items = myEditor.newItems();
 
     // Assert
-    assertEquals(7, items.size());
+    assertEquals(8, items.size());
 
     AbstractButton item = (AbstractButton)items.get(5);
 
@@ -120,7 +121,7 @@ public final class VirtualDevicePopUpMenuButtonTableCellEditorTest {
     List<JComponent> items = myEditor.newItems();
 
     // Assert
-    assertEquals(7, items.size());
+    assertEquals(8, items.size());
 
     AbstractButton item = (AbstractButton)items.get(5);
 
@@ -139,7 +140,7 @@ public final class VirtualDevicePopUpMenuButtonTableCellEditorTest {
     List<JComponent> items = myEditor.newItems();
 
     // Assert
-    assertEquals(7, items.size());
+    assertEquals(8, items.size());
 
     AbstractButton item = (AbstractButton)items.get(5);
 
@@ -169,12 +170,15 @@ public final class VirtualDevicePopUpMenuButtonTableCellEditorTest {
     List<JComponent> items = myEditor.newItems();
 
     // Assert
-    assertEquals(7, items.size());
+    assertEquals(8, items.size());
+    assertTrue(items.get(4) instanceof Separator);
 
     AbstractButton item = (AbstractButton)items.get(5);
 
     assertTrue(item.isEnabled());
     assertEquals("Pair Device", item.getText());
     assertEquals("Wear OS virtual device pairing assistant", item.getToolTipText());
+
+    assertTrue(items.get(6) instanceof Separator);
   }
 }