Removed timezone to avoid problems with different JREs

svn changeset:17487/svn branch:6.5

diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html b/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html
index 3cf29896aaf3a0ac7f5f1d3ba700c76391361351..751c7ba9bd3c7ed0126a8000e7b97191178bf58c 100644 (file)
--- a/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html
+++ b/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html
@@ -24,7 +24,7 @@
 <tr>
        <td>assertText</td>
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_1</td>
-       <td>1. DateField value is now March 3, 1973 11:46:40 AM EET</td>
+       <td>1. DateField value is now March 3, 1973 11:46:40 AM</td>
 </tr>
 <tr>
        <td>assertValue</td>
@@ -74,7 +74,7 @@
 <tr>
        <td>assertText</td>
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_1</td>
-       <td>4. DateField value is now March 15, 1973 11:46:40 AM EET</td>
+       <td>4. DateField value is now March 15, 1973 11:46:40 AM</td>
 </tr>
 <tr>
        <td>assertValue</td>
@@ -185,7 +185,7 @@
 <tr>
        <td>assertText</td>
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_1</td>
-       <td>21. DateField value is now May 4, 1990 12:00:00 AM EEST</td>
+       <td>21. DateField value is now May 4, 1990 12:00:00 AM</td>
 </tr>
 <tr>
        <td>assertValue</td>
@@ -205,7 +205,7 @@
 <tr>
        <td>assertText</td>
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_1</td>
-       <td>25. DateField value is now June 5, 2000 12:00:00 AM EEST</td>
+       <td>25. DateField value is now June 5, 2000 12:00:00 AM</td>
 </tr>
 <tr>
        <td>click</td>
@@ -230,7 +230,7 @@
 <tr>
        <td>assertText</td>
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_1</td>
-       <td>33. DateField value is now June 5, 2000 12:00:00 AM EEST</td>
+       <td>33. DateField value is now June 5, 2000 12:00:00 AM</td>
 </tr>
 <tr>
        <td>click</td>
@@ -240,7 +240,7 @@
 <tr>
        <td>assertText</td>
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_1</td>
-       <td>40. DateField value is now August 27, 2005 12:00:00 AM EEST</td>
+       <td>40. DateField value is now August 27, 2005 12:00:00 AM</td>
 </tr>
 <tr>
        <td>assertText</td>

diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java b/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
index aca1c84ca31e72755e0c92c33c56e890f4733860..7bcfeab324b5b5e9dae4a20168029d65b7eac5f2 100644 (file)
--- a/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
+++ b/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
@@ -24,7 +24,7 @@ public class DateFieldEmptyValid extends TestBase {
     private MyDateField df;\r
 \r
     private DateFormat formatter = DateFormat.getDateTimeInstance(\r
-            DateFormat.LONG, DateFormat.LONG, new Locale("en", "US"));\r
+            DateFormat.LONG, DateFormat.MEDIUM, new Locale("en", "US"));\r
 \r
     public class MyDateField extends PopupDateField {\r
         @Override\r