Merged test changes

svn changeset:13110/svn branch:6.4

diff --git a/tests/src/com/vaadin/tests/components/datefield/TestDatefieldYear.html b/tests/src/com/vaadin/tests/components/datefield/TestDatefieldYear.html
index 9ecb803ab0863c61a4af9ff5a54a352ad7049d3b..71c246593a09b625899f446efd6d90c33c9b73f6 100644 (file)
--- 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 fb1a1934c2d4031d80376d749fb76a4d9b2989df..8a1df36aa41865258a0ab5f5b2757fcc6659224c 100644 (file)
--- 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 7c25eee75de6ed4352727a794b1a0a6029fc6e19..17fb323ea34d6895bc7d77d1ec7912fc08d62e18 100644 (file)
--- 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>\r
        <td>screenCapture</td>\r
        <td></td>\r
-       <td>unfiltered</td>\r
+       <td>unfiltered-2</td>\r
 </tr>\r
 <tr>\r
        <td>click</td>\r

diff --git a/tests/test.xml b/tests/test.xml
index fd2f262e84d7f776b53d9315a9947e353455bdc5..107ef5b5a281fa36340f9e3bb4b838b5ecc54a9f 100644 (file)
--- 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." />