From b4973984443cda4c64c8758aff7568f0372e197a Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Mon, 10 May 2010 12:10:54 +0000
Subject: [PATCH] Merged test changes

svn changeset:13110/svn branch:6.4
---
 .../datefield/TestDatefieldYear.html          | 36 +++++++++++++------
 .../datefield/TestDatefieldYear.java          |  2 ++
 .../tests/components/tree/TreeFiltering.html  |  2 +-
 tests/test.xml                                |  2 +-
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/tests/src/com/vaadin/tests/components/datefield/TestDatefieldYear.html b/tests/src/com/vaadin/tests/components/datefield/TestDatefieldYear.html
index 9ecb803ab0..71c246593a 100644
--- a/tests/src/com/vaadin/tests/components/datefield/TestDatefieldYear.html
+++ b/tests/src/com/vaadin/tests/components/datefield/TestDatefieldYear.html
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/run/com.vaadin.tests.components.datefield.TestDatefieldYear</td>
+	<td>/run/com.vaadin.tests.components.datefield.TestDatefieldYear?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
@@ -21,6 +21,11 @@
 	<td></td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldTestDatefieldYear::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VPopupCalendar[0]/domChild[0]</td>
+	<td>4/09</td>
+</tr>
 <tr>
 	<td>click</td>
 	<td>vaadin=runcomvaadintestscomponentsdatefieldTestDatefieldYear::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VPopupCalendar[0]/domChild[1]</td>
@@ -32,9 +37,9 @@
 	<td></td>
 </tr>
 <tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td></td>
+	<td>assertText</td>
+	<td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr/td[3]/span</td>
+	<td>April 2009</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
@@ -87,9 +92,14 @@
 	<td></td>
 </tr>
 <tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td></td>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldTestDatefieldYear::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VPopupCalendar[0]/domChild[0]</td>
+	<td>12/07</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr/td[3]/span</td>
+	<td>December 2007</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
@@ -122,11 +132,15 @@
 	<td></td>
 </tr>
 <tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td></td>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentsdatefieldTestDatefieldYear::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VPopupCalendar[0]/domChild[0]</td>
+	<td>2/09</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr/td[3]/span</td>
+	<td>February 2009</td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/tests/src/com/vaadin/tests/components/datefield/TestDatefieldYear.java b/tests/src/com/vaadin/tests/components/datefield/TestDatefieldYear.java
index fb1a1934c2..8a1df36aa4 100644
--- a/tests/src/com/vaadin/tests/components/datefield/TestDatefieldYear.java
+++ b/tests/src/com/vaadin/tests/components/datefield/TestDatefieldYear.java
@@ -1,6 +1,7 @@
 package com.vaadin.tests.components.datefield;
 
 import java.util.Date;
+import java.util.Locale;
 
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.DateField;
@@ -20,6 +21,7 @@ public class TestDatefieldYear extends TestBase {
     @Override
     protected void setup() {
         DateField df = new DateField("Year", new Date(2009 - 1900, 4 - 1, 1));
+        df.setLocale(new Locale("en", "US"));
         df.setResolution(DateField.RESOLUTION_YEAR);
         df.setResolution(DateField.RESOLUTION_MONTH);
         addComponent(df);
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeFiltering.html b/tests/src/com/vaadin/tests/components/tree/TreeFiltering.html
index 7c25eee75d..17fb323ea3 100644
--- a/tests/src/com/vaadin/tests/components/tree/TreeFiltering.html
+++ b/tests/src/com/vaadin/tests/components/tree/TreeFiltering.html
@@ -59,7 +59,7 @@
 <tr>
 	<td>screenCapture</td>
 	<td></td>
-	<td>unfiltered</td>
+	<td>unfiltered-2</td>
 </tr>
 <tr>
 	<td>click</td>
diff --git a/tests/test.xml b/tests/test.xml
index fd2f262e84..107ef5b5a2 100644
--- a/tests/test.xml
+++ b/tests/test.xml
@@ -5,7 +5,7 @@
 	<!-- Configuration                                                      -->
 	<!-- ================================================================== -->
 	<!-- Browsers to use for testing -->
-	<property name="browsers" value="winxp-ie6,winxp-ie7,winxp-ie8,winxp-firefox36,winxp-safari4,winxp-googlechrome4,winxp-opera1050" />
+	<property name="browsers" value="winxp-ie6,winxp-ie7,winxp-ie8,winxp-firefox36,winxp-safari4,winxp-googlechrome41,winxp-opera1050" />
 	
 	<!-- Screen shot base directory -->
 	<fail unless="com.vaadin.testbench.screenshot.directory" message="The 'com.vaadin.testbench.screenshot.directory' property must be defined." />
-- 
2.39.5