Merge pull request #290 from ArcBees/mmc_test_placeholder

Add tests for Multiple select placeholder and selected text on init

integration-test/src/main/java/com/arcbees/chosen/integrationtest/client/ChosenSampleIntegrationTests.java

@@ -21,13 +21,15 @@
 
 import com.arcbees.chosen.integrationtest.client.testcases.AllowSingleDeselect;
 import com.arcbees.chosen.integrationtest.client.testcases.ChooseOption;
+import com.arcbees.chosen.integrationtest.client.testcases.ChosenListBoxMultipleSelect;
 import com.arcbees.chosen.integrationtest.client.testcases.ChosenListBoxMultipleSelectAddItems;
 import com.arcbees.chosen.integrationtest.client.testcases.ChosenListBoxSingleSelectAddItems;
 import com.arcbees.chosen.integrationtest.client.testcases.DisableSearchThreshold;
 import com.arcbees.chosen.integrationtest.client.testcases.EnabledDisabled;
 import com.arcbees.chosen.integrationtest.client.testcases.HideEmptyValues;
 import com.arcbees.chosen.integrationtest.client.testcases.IsAcceptedValueListBox;
 import com.arcbees.chosen.integrationtest.client.testcases.MaxSelectedOptions;
+import com.arcbees.chosen.integrationtest.client.testcases.MultiValueListBoxSelectedOptionsOnInit;
 import com.arcbees.chosen.integrationtest.client.testcases.SearchContains;
 import com.arcbees.chosen.integrationtest.client.testcases.ShowNonEmptyValues;
 import com.arcbees.chosen.integrationtest.client.testcases.SimpleMultiValueListBox;
@@ -76,6 +78,8 @@ public ChosenSampleIntegrationTests() {
         registerTestCase(new SimpleMultiValueListBoxOnChange());
         registerTestCase(new ChosenListBoxMultipleSelectAddItems());
         registerTestCase(new ChosenListBoxSingleSelectAddItems());
+        registerTestCase(new MultiValueListBoxSelectedOptionsOnInit());
+        registerTestCase(new ChosenListBoxMultipleSelect());
     }
 
     @Override

integration-test/src/main/java/com/arcbees/chosen/integrationtest/client/testcases/ChosenListBoxMultipleSelect.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015 ArcBees Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.arcbees.chosen.integrationtest.client.testcases;
+
+import com.arcbees.chosen.client.gwt.ChosenListBox;
+import com.arcbees.chosen.integrationtest.client.TestCase;
+import com.google.gwt.user.client.ui.RootPanel;
+
+public class ChosenListBoxMultipleSelect extends TestCase {
+    private ChosenListBox listBox;
+
+    @Override
+    public void run() {
+        listBox = new ChosenListBox(true);
+        listBox.setWidth("200px");
+        listBox.addItem("One");
+        listBox.addItem("Two");
+        listBox.addItem("Three");
+
+        RootPanel.get().add(listBox);
+    }
+
+    public ChosenListBox getListBox() {
+        return listBox;
+    }
+}

integration-test/src/main/java/com/arcbees/chosen/integrationtest/client/testcases/ChosenListBoxMultipleSelectAddItems.java

@@ -17,29 +17,26 @@
 package com.arcbees.chosen.integrationtest.client.testcases;
 
 import com.arcbees.chosen.client.gwt.ChosenListBox;
-import com.arcbees.chosen.integrationtest.client.TestCase;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.RootPanel;
 
-public class ChosenListBoxMultipleSelectAddItems extends TestCase {
+public class ChosenListBoxMultipleSelectAddItems extends ChosenListBoxMultipleSelect {
     public static final String BUTTON_ID = "ChosenListBoxMultipleSelectAddItems-button";
     public static final String SELECTED_VALUE = "Six";
 
     @Override
     public void run() {
-        final ChosenListBox listBox = new ChosenListBox(true);
-        listBox.setWidth("200px");
-        listBox.addItem("One");
-        listBox.addItem("Two");
-        listBox.addItem("Three");
+        super.run();
 
         Button button = new Button("Add items and select Six");
         button.getElement().setId(BUTTON_ID);
         button.addClickHandler(new ClickHandler() {
             @Override
             public void onClick(ClickEvent event) {
+                ChosenListBox listBox = getListBox();
+
                 listBox.clear();
                 listBox.addItem("Four");
                 listBox.addItem("Five");
@@ -49,7 +46,6 @@ public void onClick(ClickEvent event) {
             }
         });
 
-        RootPanel.get().add(listBox);
         RootPanel.get().add(button);
     }
 }

integration-test/src/main/java/com/arcbees/chosen/integrationtest/client/testcases/MultiValueListBoxSelectedOptionsOnInit.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015 ArcBees Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.arcbees.chosen.integrationtest.client.testcases;
+
+import com.arcbees.chosen.client.gwt.MultipleChosenValueListBox;
+import com.arcbees.chosen.integrationtest.client.domain.CarBrand;
+import com.google.common.collect.Lists;
+
+public class MultiValueListBoxSelectedOptionsOnInit extends SimpleMultiValueListBox {
+    @Override
+    public void run() {
+        super.run();
+
+        MultipleChosenValueListBox<CarBrand> listBox = getListBox();
+        listBox.setValue(Lists.newArrayList(CarBrand.BENTLEY, CarBrand.CADILLAC));
+    }
+}

integration-test/src/test/java/ChosenIT.java

@@ -28,9 +28,12 @@
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
+import com.arcbees.chosen.client.ChosenImpl;
 import com.arcbees.chosen.integrationtest.client.TestCase;
 import com.arcbees.chosen.integrationtest.client.domain.CarBrand;
+import com.arcbees.chosen.integrationtest.client.testcases.AllowSingleDeselect;
 import com.arcbees.chosen.integrationtest.client.testcases.ChooseOption;
+import com.arcbees.chosen.integrationtest.client.testcases.ChosenListBoxMultipleSelect;
 import com.arcbees.chosen.integrationtest.client.testcases.DisableSearchThreshold;
 import com.arcbees.chosen.integrationtest.client.testcases.EnabledDisabled;
 import com.arcbees.chosen.integrationtest.client.testcases.HideEmptyValues;
@@ -55,6 +58,7 @@
 import static org.openqa.selenium.support.ui.ExpectedConditions.textToBePresentInElement;
 
 import static com.arcbees.chosen.integrationtest.client.domain.CarBrand.AUDI;
+import static com.arcbees.chosen.integrationtest.client.domain.CarBrand.CADILLAC;
 import static com.arcbees.chosen.integrationtest.client.domain.CarBrand.FORD;
 import static com.arcbees.chosen.integrationtest.client.domain.DefaultCarRenderer.RENDERER;
 
@@ -87,6 +91,34 @@ public void chooseOption() throws Throwable {
         assertThat(getSelectedOptionText()).isEqualTo(fordRender);
     }
 
+    /**
+     * Goal: ensure allowSingleDeselect is working properly.
+     */
+    @Test
+    public void allowSingleDeselect() {
+        // Given
+        loadTestCase(new AllowSingleDeselect());
+        clickOption(CADILLAC, RENDERER);
+
+        // When
+        singleDeselect();
+
+        // Then
+        assertThat(getSelectedOptionText()).isEqualTo(AllowSingleDeselect.PLACEHOLDER);
+    }
+
+    /**
+     * Ensure default text is displayed on Multiple select.
+     */
+    @Test
+    public void multipleListBox_displayPlaceHolder() {
+        // Given
+        loadTestCase(new ChosenListBoxMultipleSelect());
+
+        // Then
+        assertThat(getMultiplePlaceHolderText()).isEqualTo(ChosenImpl.MULTIPLE_DEFAULT_TEXT);
+    }
+
     /**
      * Tests the disableSearchThreshold options.
      */
@@ -311,12 +343,14 @@ protected WebElement getDropdown() {
                 By.className("com-arcbees-chosen-client-resources-ChosenCss-chzn-drop")));
     }
 
-    protected WebElement getPlaceholder() {
+    protected WebElement getSinglePlaceholder() {
         String xpath = "//div[@id='chosen_container__0_chzn']//a";
 
         return webDriverWait().until(presenceOfElementLocated(By.xpath(xpath)));
     }
 
+    protected abstract String getMultiplePlaceHolderText();
+
     protected int getDropdownTop() {
         WebElement dropdown = getDropdown();
         String topString = dropdown.getCssValue("top");

integration-test/src/test/java/DesktopChosenIT.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2015 ArcBees Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -23,7 +23,6 @@
 import org.openqa.selenium.WebElement;
 
 import com.arcbees.chosen.integrationtest.client.domain.CarBrand;
-import com.arcbees.chosen.integrationtest.client.testcases.AllowSingleDeselect;
 import com.arcbees.chosen.integrationtest.client.testcases.ChosenListBoxMultipleSelectAddItems;
 import com.arcbees.chosen.integrationtest.client.testcases.ChosenListBoxSingleSelectAddItems;
 import com.arcbees.chosen.integrationtest.client.testcases.MaxSelectedOptions;
@@ -47,30 +46,12 @@
 
 import static com.arcbees.chosen.integrationtest.client.domain.CarBrand.AUDI;
 import static com.arcbees.chosen.integrationtest.client.domain.CarBrand.BMW;
-import static com.arcbees.chosen.integrationtest.client.domain.CarBrand.CADILLAC;
 import static com.arcbees.chosen.integrationtest.client.domain.CarBrand.HONDA;
 import static com.arcbees.chosen.integrationtest.client.domain.CarBrand.MERCEDES;
 import static com.arcbees.chosen.integrationtest.client.domain.CarBrand.TOYOTA;
 import static com.arcbees.chosen.integrationtest.client.domain.DefaultCarRenderer.RENDERER;
 
 public class DesktopChosenIT extends ChosenIT {
-
-    /**
-     * Goal: ensure allowSingleDeselect is working properly.
-     */
-    @Test
-    public void allowSingleDeselect() {
-        // Given
-        loadTestCase(new AllowSingleDeselect());
-        clickOption(CADILLAC, RENDERER);
-
-        // When
-        singleDeselect();
-
-        // Then
-        assertThat(getSelectedOptionText()).isEqualTo(AllowSingleDeselect.PLACEHOLDER);
-    }
-
     /**
      * Tests that when
      * - we deselect an option to a multiple chosen list box.
@@ -297,7 +278,7 @@ public void chosenListBox_updateAndSelect_removeDefaultStyle() {
 
         // Then
         assertThat(getSelectedOptionText()).isEqualTo(ChosenListBoxSingleSelectAddItems.SELECTED_VALUE);
-        assertThat(getPlaceholder().getAttribute("class")).doesNotContain("chzn-default");
+        assertThat(getSinglePlaceholder().getAttribute("class")).doesNotContain("chzn-default");
     }
 
     /**
@@ -349,6 +330,13 @@ public void maxSelectedOptions_optionsNotSelectableAnymore() {
         assertDropdownIsClosed();
     }
 
+    @Override
+    protected String getMultiplePlaceHolderText() {
+        String xpath = "//div[@id='chosen_container__0_chzn']//input";
+
+        return webDriverWait().until(presenceOfElementLocated(By.xpath(xpath))).getAttribute("value");
+    }
+
     protected void openDropDown() {
         WebElement btn;
 

integration-test/src/test/java/MobileChosenIT.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2015 ArcBees Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -25,12 +25,14 @@
 import com.arcbees.chosen.integrationtest.client.domain.CarBrand;
 import com.arcbees.chosen.integrationtest.client.testcases.ChosenListBoxMultipleSelectAddItems;
 import com.arcbees.chosen.integrationtest.client.testcases.MaxSelectedOptions;
+import com.arcbees.chosen.integrationtest.client.testcases.MultiValueListBoxSelectedOptionsOnInit;
 import com.arcbees.chosen.integrationtest.client.testcases.SimpleMultiValueListBox;
 import com.arcbees.chosen.integrationtest.client.testcases.SimpleValueListBox;
 import com.google.common.base.Predicate;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.openqa.selenium.support.ui.ExpectedConditions.elementToBeClickable;
+import static org.openqa.selenium.support.ui.ExpectedConditions.presenceOfElementLocated;
 
 import static com.arcbees.chosen.integrationtest.client.domain.CarBrand.HONDA;
 import static com.arcbees.chosen.integrationtest.client.domain.CarBrand.MERCEDES;
@@ -118,6 +120,15 @@ public void maxSelectedOptions_optionsNotSelectableAnymore() {
         assertDropdownIsOpenWithMobileLayout();
     }
 
+    @Test
+    public void selectedValuesOnInit_setsItemsSelectedText() {
+        // Given
+        loadTestCase(new MultiValueListBoxSelectedOptionsOnInit());
+
+        // Then
+        assertThat(getSelectedOptionText()).isEqualTo("2 items selected");
+    }
+
     /**
      * On mobile, we should be able to close the dropdown by clicking on the icon net to the input.
      */
@@ -166,6 +177,13 @@ public boolean apply(WebDriver input) {
         assertThat(getDropdown().getAttribute("class")).doesNotContain(IS_OPEN);
     }
 
+    @Override
+    protected String getMultiplePlaceHolderText() {
+        String xpath = "//div[@id='chosen_container__0_chzn']//span";
+
+        return webDriverWait().until(presenceOfElementLocated(By.xpath(xpath))).getText();
+    }
+
     protected void openDropDown() {
         String xpath = "//div[@id='chosen_container__0_chzn']";
         WebElement btn = webDriverWait().until(elementToBeClickable(By.xpath(xpath)));

plugin/src/main/java/com/arcbees/chosen/client/ChosenImpl.java

@@ -62,6 +62,9 @@
 import static com.google.gwt.safehtml.shared.SafeHtmlUtils.fromTrustedString;
 
 public abstract class ChosenImpl {
+    public static final String MULTIPLE_DEFAULT_TEXT = "Select Some Options";
+    public static final String SINGLE_DEFAULT_TEXT = "Select an Option";
+
     static final int BACKSPACE = 8;
     static final String TABINDEX_PROPERTY = "tabindex";
 
@@ -1246,15 +1249,15 @@ private void setDefaultText() {
             } else if (options.getPlaceholderText() != null) {
                 defaultText = options.getPlaceholderText();
             } else {
-                defaultText = "Select Some Options";
+                defaultText = MULTIPLE_DEFAULT_TEXT;
             }
         } else {
             if (options.getPlaceholderTextSingle() != null) {
                 defaultText = options.getPlaceholderTextSingle();
             } else if (options.getPlaceholderText() != null) {
                 defaultText = options.getPlaceholderText();
             } else {
-                defaultText = "Select an Option";
+                defaultText = SINGLE_DEFAULT_TEXT;
             }
         }