]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 96bbe5c)
enhanced test case
authorMatti Tahvonen <matti.tahvonen@itmill.com>
Wed, 5 Jan 2011 09:43:31 +0000 (09:43 +0000)
committerMatti Tahvonen <matti.tahvonen@itmill.com>
Wed, 5 Jan 2011 09:43:31 +0000 (09:43 +0000)
svn changeset:16800/svn branch:6.5

tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html patch | blob | history
tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java patch | blob | history

diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html b/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html
index ebd038f792d160c1ffdfa58e37adf1149ebfcbdb..7acd33234e939e3aba9daccafee5a386c618b58a 100644 (file)
--- a/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html
+++ b/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="" />
+<link rel="selenium.base" href="http://localhost:8888/" />
 <title>DateFieldEmptyValid</title>
 </head>
 <body>
@@ -16,11 +16,6 @@
        <td>/run/com.vaadin.tests.components.datefield.DateFieldEmptyValid?restartApplication</td>
        <td></td>
 </tr>
-<tr>
-       <td>waitForVaadin</td>
-       <td></td>
-       <td></td>
-</tr>
 <tr>
        <td>assertText</td>
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_0</td>
@@ -74,12 +69,12 @@
 <tr>
        <td>assertText</td>
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_0</td>
-       <td>4. isEmpty: false, isValid: true</td>
+       <td>5. isEmpty: false, isValid: true</td>
 </tr>
 <tr>
        <td>assertText</td>
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_1</td>
-       <td>3. DateField value is now Thu Mar 15 11:46:40 GMT+02:00 1973</td>
+       <td>4. DateField value is now Thu Mar 15 11:46:40 GMT+02:00 1973</td>
 </tr>
 <tr>
        <td>assertValue</td>
@@ -114,12 +109,12 @@
 <tr>
        <td>assertText</td>
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_0</td>
-       <td>8. isEmpty: true, isValid: false</td>
+       <td>11. isEmpty: true, isValid: false</td>
 </tr>
 <tr>
        <td>assertText</td>
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_1</td>
-       <td>7. DateField value is now null</td>
+       <td>10. DateField value is now null</td>
 </tr>
 <tr>
        <td>mouseClick</td>
@@ -144,12 +139,12 @@
 <tr>
        <td>assertText</td>
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_0</td>
-       <td>10. isEmpty: true, isValid: false</td>
+       <td>14. isEmpty: true, isValid: false</td>
 </tr>
 <tr>
        <td>assertText</td>
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_1</td>
-       <td>9. DateField value is now null</td>
+       <td>13. DateField value is now null</td>
 </tr>
 <tr>
        <td>click</td>
@@ -166,15 +161,16 @@
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_Scheck-value/domChild[0]/domChild[0]</td>
        <td></td>
 </tr>
+<!--Note, no value change should happen, value was and is null, validity would have changed if the test had the required flag off-->
 <tr>
        <td>assertText</td>
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_1</td>
-       <td>11. DateField value is now null</td>
+       <td>17. DateField value is now null</td>
 </tr>
 <tr>
        <td>assertText</td>
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_0</td>
-       <td>12. isEmpty: true, isValid: false</td>
+       <td>18. isEmpty: true, isValid: false</td>
 </tr>
 <tr>
        <td>click</td>
@@ -184,12 +180,12 @@
 <tr>
        <td>assertText</td>
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_0</td>
-       <td>14. isEmpty: false, isValid: true</td>
+       <td>22. isEmpty: false, isValid: true</td>
 </tr>
 <tr>
        <td>assertText</td>
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_1</td>
-       <td>13. DateField value is now 1990-05-04</td>
+       <td>21. DateField value is now 1990-05-04</td>
 </tr>
 <tr>
        <td>assertValue</td>
@@ -204,57 +200,52 @@
 <tr>
        <td>assertText</td>
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_0</td>
-       <td>16. isEmpty: false, isValid: true</td>
+       <td>26. isEmpty: false, isValid: true</td>
 </tr>
 <tr>
        <td>assertText</td>
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_1</td>
-       <td>15. DateField value is now 2000-06-05</td>
+       <td>25. DateField value is now 2000-06-05</td>
 </tr>
 <tr>
        <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_Sclear/domChild[0]/domChild[0]</td>
        <td></td>
 </tr>
 <tr>
        <td>assertText</td>
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_0</td>
-       <td>18. isEmpty: true, isValid: false</td>
+       <td>30. isEmpty: true, isValid: false</td>
 </tr>
 <tr>
        <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[5]/VButton[0]/domChild[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_Sset-by-ds/domChild[0]/domChild[0]</td>
        <td></td>
 </tr>
-<tr>
-       <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_0</td>
-       <td>105,12</td>
-</tr>
 <tr>
        <td>assertText</td>
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_0</td>
-       <td>22. isEmpty: false, isValid: true</td>
+       <td>34. isEmpty: false, isValid: true</td>
 </tr>
 <tr>
        <td>assertText</td>
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_1</td>
-       <td>21. DateField value is now 2000-06-05</td>
+       <td>33. DateField value is now 2000-06-05</td>
 </tr>
 <tr>
        <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[6]/VButton[0]/domChild[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_Sset-via-ds/domChild[0]/domChild[0]</td>
        <td></td>
 </tr>
 <tr>
        <td>assertText</td>
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_1</td>
-       <td>25. DateField value is now 2005-08-27</td>
+       <td>40. DateField value is now 2005-08-27</td>
 </tr>
 <tr>
        <td>assertText</td>
        <td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldEmptyValid::PID_SLog_row_0</td>
-       <td>26. isEmpty: false, isValid: true</td>
+       <td>41. isEmpty: false, isValid: true</td>
 </tr>
 
 </tbody></table>
diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java b/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
index 5edeae751f9b420462810ca20151fd99194e5af7..736fdc87a6c476cbb3583fe6186e9f2b15d70ef0 100644 (file)
--- a/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
+++ b/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
@@ -33,7 +33,7 @@ public class DateFieldEmptyValid extends TestBase {
     @Override\r
     protected void setup() {\r
         addComponent(new Label("<br/><br/>", Label.CONTENT_XHTML));\r
-        log = new Log(5);\r
+        log = new Log(8);\r
         addComponent(log);\r
         df = new MyDateField();\r
         df.setDebugId("DateField");\r
@@ -44,6 +44,7 @@ public class DateFieldEmptyValid extends TestBase {
         df.setResolution(DateField.RESOLUTION_DAY);\r
         df.addListener(new ValueChangeListener() {\r
             public void valueChange(ValueChangeEvent event) {\r
+                log.log("Value changeEvent");\r
                 checkEmpty();\r
             }\r
         });\r
@@ -54,6 +55,7 @@ public class DateFieldEmptyValid extends TestBase {
         b.addListener(new ClickListener() {\r
 \r
             public void buttonClick(ClickEvent event) {\r
+                log.log("Clearing date aka setValue(null)");\r
                 df.setValue(null);\r
             }\r
         });\r
@@ -65,6 +67,7 @@ public class DateFieldEmptyValid extends TestBase {
 \r
             @SuppressWarnings("deprecation")\r
             public void buttonClick(ClickEvent event) {\r
+                log.log("Setting new value to datefield (4.5.1990)");\r
                 df.setValue(new Date(1990 - 1900, 5 - 1, 4));\r
             }\r
         });\r
@@ -75,6 +78,7 @@ public class DateFieldEmptyValid extends TestBase {
 \r
             @SuppressWarnings("deprecation")\r
             public void buttonClick(ClickEvent event) {\r
+                log.log("Setting new object property (5.6.2000) to datefield");\r
                 ObjectProperty<Date> dfProp = new ObjectProperty<Date>(\r
                         new Date(2000 - 1900, 6 - 1, 5), Date.class);\r
                 df.setPropertyDataSource(dfProp);\r
@@ -84,12 +88,13 @@ public class DateFieldEmptyValid extends TestBase {
         addComponent(b);\r
 \r
         b = new Button(\r
-                "Set date to 27.8.2005 by changing a property data source from null");\r
+                "Set date to 27.8.2005 by changing a new property data source from null, ds attached before value setting.");\r
         b.setDebugId("set-via-ds");\r
         b.addListener(new ClickListener() {\r
 \r
             @SuppressWarnings("deprecation")\r
             public void buttonClick(ClickEvent event) {\r
+                log.log("Setting object property (with value null) to datefield and set value of property to 27.8.2005");\r
                 ObjectProperty<Date> dfProp = new ObjectProperty<Date>(null,\r
                         Date.class);\r
                 df.setPropertyDataSource(dfProp);\r
@@ -102,6 +107,7 @@ public class DateFieldEmptyValid extends TestBase {
         b.setDebugId("check-value");\r
         b.addListener(new ClickListener() {\r
             public void buttonClick(ClickEvent event) {\r
+                log.log("Checking state");\r
                 checkEmpty();\r
             }\r
         });\r
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework