Revert "Update ComboBox internal state on new item added (#11094)" (#11331)

* Revert "Update ComboBox internal state on new item added (#11094)"

This reverts commit 56ce91c6160a252ddcd952bca6eb7037120ebf59.

* Add tests to verify the issue

5 files changed, 47 insertions, 5 deletions

diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxAddingSameItemTwoTimesWithItemHandlerReset.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxAddingSameItemTwoTimesWithItemHandlerReset.java
new file mode 100644
index 0000000000..f50cf8a92b
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxAddingSameItemTwoTimesWithItemHandlerReset.java
@@ -0,0 +1,5 @@
+package com.vaadin.tests.components.combobox;
+
+public class ComboBoxAddingSameItemTwoTimesWithItemHandlerReset
+        extends ComboBoxSelectingNewItemValueChange {
+}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxAddingSameItemTwoTimesWithItemProviderReset.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxAddingSameItemTwoTimesWithItemProviderReset.java
new file mode 100644
index 0000000000..d43214eed3
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxAddingSameItemTwoTimesWithItemProviderReset.java
@@ -0,0 +1,5 @@
+package com.vaadin.tests.components.combobox;
+
+public class ComboBoxAddingSameItemTwoTimesWithItemProviderReset
+        extends ComboBoxNewItemProvider {
+}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxAddingSameItemTwoTimesWithItemHandlerResetTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxAddingSameItemTwoTimesWithItemHandlerResetTest.java
new file mode 100644
index 0000000000..dbaa3a648f
--- /dev/null
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxAddingSameItemTwoTimesWithItemHandlerResetTest.java
@@ -0,0 +1,24 @@
+package com.vaadin.tests.components.combobox;
+
+public class ComboBoxAddingSameItemTwoTimesWithItemHandlerResetTest
+        extends ComboBoxSelectingNewItemValueChangeTest {
+
+    @Override
+    public void itemHandling(
+            ComboBoxSelectingNewItemValueChangeTest.SelectionType selectionType,
+            String[] inputs) {
+        assertThatSelectedValueIs("");
+
+        // add new item for the first time
+        typeInputAndSelect(inputs[0], selectionType);
+        assertThatSelectedValueIs(inputs[0]);
+        assertValueChange(1);
+
+        reset();
+
+        // add the same item for the 2nd time
+        typeInputAndSelect(inputs[0], selectionType);
+        assertThatSelectedValueIs(inputs[0]);
+        assertValueChange(1);
+    }
+}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxAddingSameItemTwoTimesWithItemProviderResetTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxAddingSameItemTwoTimesWithItemProviderResetTest.java
new file mode 100644
index 0000000000..d2ed70d211
--- /dev/null
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxAddingSameItemTwoTimesWithItemProviderResetTest.java
@@ -0,0 +1,6 @@
+package com.vaadin.tests.components.combobox;
+
+public class ComboBoxAddingSameItemTwoTimesWithItemProviderResetTest
+        extends ComboBoxAddingSameItemTwoTimesWithItemHandlerResetTest {
+    // same tests using NewItemProvider instead of NewItemHandler
+}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingNewItemValueChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingNewItemValueChangeTest.java
index 0707ebd020..1e2869df61 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingNewItemValueChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingNewItemValueChangeTest.java
@@ -1,6 +1,7 @@
 package com.vaadin.tests.components.combobox;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 import org.openqa.selenium.Keys;
@@ -18,7 +19,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 public class ComboBoxSelectingNewItemValueChangeTest extends MultiBrowserTest {
 
-    private enum SelectionType {
+    protected enum SelectionType {
         ENTER, TAB, CLICK_OUT;
     }
 
@@ -134,7 +135,8 @@ public class ComboBoxSelectingNewItemValueChangeTest extends MultiBrowserTest {
         assertItemCount(2602);
     }
 
-    private void typeInputAndSelect(String input, SelectionType selectionType) {
+    protected void typeInputAndSelect(String input,
+            SelectionType selectionType) {
         comboBoxElement.clear();
         sendKeysToInput(input);
         switch (selectionType) {
@@ -166,7 +168,7 @@ public class ComboBoxSelectingNewItemValueChangeTest extends MultiBrowserTest {
         }
     }
 
-    private void assertThatSelectedValueIs(final String value) {
+    protected void assertThatSelectedValueIs(final String value) {
         waitUntil(new ExpectedCondition<Boolean>() {
             private String actualComboBoxValue;
             private String actualLabelValue;
@@ -189,7 +191,7 @@ public class ComboBoxSelectingNewItemValueChangeTest extends MultiBrowserTest {
         });
     }
 
-    private void assertValueChange(int count) {
+    protected void assertValueChange(int count) {
         assertEquals(String.format(
                 "Value change count: %s Selection change count: %s user originated: true",
                 count, count), changeLabelElement.getText());
@@ -226,7 +228,7 @@ public class ComboBoxSelectingNewItemValueChangeTest extends MultiBrowserTest {
         }
     }
 
-    private void reset() {
+    protected void reset() {
         $(ButtonElement.class).id("reset").click();
     }