Fixed "EEE" in DateField's date pattern (#13443)

Change-Id: Ib82d901fbf65dc39c06b117c68bb0191f0fd8e68

3 files changed, 96 insertions, 1 deletions

diff --git a/client/src/com/vaadin/client/DateTimeService.java b/client/src/com/vaadin/client/DateTimeService.java
index 5fd0574d3e..2388bd38fb 100644
--- a/client/src/com/vaadin/client/DateTimeService.java
+++ b/client/src/com/vaadin/client/DateTimeService.java
@@ -344,7 +344,7 @@ public class DateTimeService {
 
         if (formatStr.contains("EEE")) {
 
-            String dayName = getShortDay(date.getMonth());
+            String dayName = getShortDay(date.getDay());
 
             if (dayName != null) {
                 /*
diff --git a/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormatEEE.java b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormatEEE.java
new file mode 100644
index 0000000000..ce9d021c79
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormatEEE.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2000-2013 Vaadin Ltd.
+ * 
+ * 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.vaadin.tests.components.datefield;
+
+import java.util.Calendar;
+import java.util.Locale;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.datefield.Resolution;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.VerticalLayout;
+
+public class CustomDateFormatEEE extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        Calendar cal = Calendar.getInstance();
+        cal.set(2014, 2, 14); // Friday
+
+        DateField df = new DateField("Should display 14/03/2014 Fri");
+        df.setResolution(Resolution.DAY);
+        df.setLocale(new Locale("en", "US"));
+
+        String pattern = "dd/MM/yyyy EEE";
+        df.setDateFormat(pattern);
+        df.setValue(cal.getTime());
+        df.setWidth("200px");
+
+        VerticalLayout layout = new VerticalLayout();
+        layout.addComponent(df);
+        layout.setMargin(true);
+        setContent(layout);
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Verifies that \"EEE\" works as a part of custom date pattern";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 13443;
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormatEEETest.java b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormatEEETest.java
new file mode 100644
index 0000000000..286da85f06
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormatEEETest.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2000-2013 Vaadin Ltd.
+ * 
+ * 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.vaadin.tests.components.datefield;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.openqa.selenium.By;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class CustomDateFormatEEETest extends MultiBrowserTest {
+
+    @Test
+    public void verifyDatePattern() {
+        openTestURL();
+
+        String dateValue = driver.findElement(
+                By.className("v-datefield-textfield")).getAttribute("value");
+        assertEquals("14/03/2014 Fri", dateValue);
+    }
+
+}