Reset selected icon when blurring a ComboBox (#8082)

* Reset selected icon when blurring a ComboBox

Fixes #8073

* Merge branch '7.7' into _combobox-icon-reset-selection

* Merge branch '7.7' into _combobox-icon-reset-selection

1 files changed, 41 insertions, 1 deletions

diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java
index 15c87b65f0..2b8ffa1583 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java
@@ -1,7 +1,10 @@
 package com.vaadin.tests.components.combobox;
 
+import org.junit.Assert;
 import org.junit.Test;
+import org.openqa.selenium.Keys;
 
+import com.vaadin.testbench.By;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.tests.tb3.newelements.ComboBoxElement;
 
@@ -29,4 +32,41 @@ public class ComboBoxItemIconTest extends MultiBrowserTest {
         compareScreen("fi-au-selected");
     }
 
-}
\ No newline at end of file
+    @Test
+    public void iconResetOnSelectionCancelByEscape() {
+        openTestURL();
+        ComboBoxElement cb = $(ComboBoxElement.class).get(1);
+
+        assertSelection(cb, "hu.gif", "Hungary");
+        cb.openPopup();
+        cb.sendKeys(Keys.UP);
+        assertSelection(cb, "au.gif", "Australia");
+        cb.sendKeys(Keys.ESCAPE);
+        assertSelection(cb, "hu.gif", "Hungary");
+    }
+
+    @Test
+    public void iconResetOnSelectionCancelByClickingOutside() {
+        openTestURL();
+        ComboBoxElement cb = $(ComboBoxElement.class).get(1);
+
+        assertSelection(cb, "hu.gif", "Hungary");
+        cb.openPopup();
+        cb.sendKeys(Keys.UP);
+        assertSelection(cb, "au.gif", "Australia");
+        findElement(By.tagName("body")).click();
+        assertSelection(cb, "hu.gif", "Hungary");
+
+    }
+
+    private void assertSelection(ComboBoxElement cb, String imageSuffix,
+            String caption) {
+        Assert.assertEquals(caption, cb.getValue());
+        String imgSrc = cb.findElement(By.className("v-icon"))
+                .getAttribute("src");
+        imgSrc = imgSrc.substring(imgSrc.lastIndexOf('/') + 1);
+        Assert.assertEquals(imageSuffix, imgSrc);
+
+    }
+
+}