Made Date printing consistent

svn changeset:16679/svn branch:6.5

diff --git a/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java b/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
index e56ceaee8e79a436278bd40482095b216f072c51..dc0f01f714f7b7721cf9d002ab224e2d55aa20aa 100644 (file)
--- a/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
+++ b/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
@@ -1,11 +1,13 @@
 package com.vaadin.tests.components.abstractfield;\r
 \r
+import java.text.SimpleDateFormat;\r
 import java.util.ArrayList;\r
 import java.util.Collection;\r
 import java.util.Collections;\r
 import java.util.Date;\r
 import java.util.LinkedHashMap;\r
 import java.util.List;\r
+import java.util.Locale;\r
 \r
 import com.vaadin.data.Property.ReadOnlyStatusChangeEvent;\r
 import com.vaadin.data.Property.ReadOnlyStatusChangeListener;\r
@@ -159,9 +161,15 @@ public abstract class AbstractFieldTest<T extends AbstractField> extends
         // Distinguish between null and 'null'\r
         String value = "null";\r
         if (o != null) {\r
-            value = "'" + o.toString() + "'";\r
             if (o instanceof Date) {\r
-                value += "(" + ((Date) o).getTime() + ")";\r
+                Date d = (Date) o;\r
+                // Dec 31, 2068 23:09:26.531\r
+                String pattern = "MMM d, yyyy HH:mm:ss.SSS";\r
+                SimpleDateFormat format = new SimpleDateFormat(pattern,\r
+                        new Locale("en", "US"));\r
+                value = format.format(d);\r
+            } else {\r
+                value = "'" + o.toString() + "'";\r
             }\r
         }\r
 \r

diff --git a/tests/src/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html b/tests/src/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html
index 9fb9919951d6e15126d6bc02c8e9aa020beb0ea9..58809a18363aaa0fd3d29a6a5688ec4d095aac75 100644 (file)
--- a/tests/src/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html
+++ b/tests/src/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html
@@ -114,7 +114,7 @@
 <tr>\r
        <td>assertText</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>\r
-       <td>3. ValueChangeEvent, new value: 'Sun Dec 12 00:00:00 EET 2010'(1292104800000)</td>\r
+       <td>3. ValueChangeEvent, new value: Dec 12, 2010 00:00:00.000</td>\r
 </tr>\r
 <tr>\r
        <td>mouseClick</td>\r
@@ -179,14 +179,13 @@
 <tr>\r
        <td>assertText</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>\r
-       <td>6. ValueChangeEvent, new value: 'Sun Jan 02 03:04:05 EET 2000'(946775045002)</td>\r
+       <td>6. ValueChangeEvent, new value: Jan 2, 2000 03:04:05.002</td>\r
 </tr>\r
 <tr>\r
        <td>assertValue</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldInlineDateFieldTest::PID_StestComponent/domChild[0]/domChild[1]/domChild[2]/domChild[0]/domChild[0]/domChild[6]</td>\r
        <td>002</td>\r
 </tr>\r
-\r
 </tbody></table>\r
 </body>\r
 </html>\r