Updated test to catch #5772

svn changeset:15513/svn branch:6.4

diff --git a/tests/src/com/vaadin/tests/components/table/FooterClick.html b/tests/src/com/vaadin/tests/components/table/FooterClick.html
index b7d20ab5d30f19bd25e21e73d844048f607aac44..fb3d004620609df6a5e92e042613350be1e5d39c 100644 (file)
--- a/tests/src/com/vaadin/tests/components/table/FooterClick.html
+++ b/tests/src/com/vaadin/tests/components/table/FooterClick.html
@@ -16,72 +16,108 @@
        <td>/run/com.vaadin.tests.components.table.FooterClick?restartApplication</td>
        <td></td>
 </tr>
+<!--Click on text in cell-->
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentstableFooterClick::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentstableFooterClick::PID_Stable/domChild[2]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
        <td>41,7</td>
 </tr>
 <tr>
        <td>assertValue</td>
-       <td>vaadin=runcomvaadintestscomponentstableFooterClick::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTextField[0]</td>
+       <td>vaadin=runcomvaadintestscomponentstableFooterClick::PID_SClickedColumn</td>
        <td>col1</td>
 </tr>
+<tr>
+       <td>assertText</td>
+       <td>vaadin=runcomvaadintestscomponentstableFooterClick::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+       <td>1. Clicked on footer: col1</td>
+</tr>
+<!--Click on empty cell-->
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentstableFooterClick::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentstableFooterClick::PID_Stable/domChild[2]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]</td>
        <td>69,12</td>
 </tr>
 <tr>
        <td>assertValue</td>
-       <td>vaadin=runcomvaadintestscomponentstableFooterClick::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTextField[0]</td>
+       <td>vaadin=runcomvaadintestscomponentstableFooterClick::PID_SClickedColumn</td>
        <td>col2</td>
 </tr>
+<tr>
+       <td>assertText</td>
+       <td>vaadin=runcomvaadintestscomponentstableFooterClick::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+       <td>2. Clicked on footer: col2</td>
+</tr>
+<!--Click on cell, not on text-->
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentstableFooterClick::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentstableFooterClick::PID_Stable/domChild[2]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
        <td>19,3</td>
 </tr>
 <tr>
        <td>assertValue</td>
-       <td>vaadin=runcomvaadintestscomponentstableFooterClick::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTextField[0]</td>
+       <td>vaadin=runcomvaadintestscomponentstableFooterClick::PID_SClickedColumn</td>
        <td>col3</td>
 </tr>
+<tr>
+       <td>assertText</td>
+       <td>vaadin=runcomvaadintestscomponentstableFooterClick::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+       <td>3. Clicked on footer: col3</td>
+</tr>
 <!--non-immediate-->
 <tr>
        <td>mouseClick</td>
        <td>vaadin=runcomvaadintestscomponentstableFooterClick::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>
        <td>30,9</td>
 </tr>
+<!--Click on text in cell-->
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentstableFooterClick::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
-       <td>56,7</td>
+       <td>vaadin=runcomvaadintestscomponentstableFooterClick::PID_Stable/domChild[2]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+       <td>41,7</td>
 </tr>
 <tr>
        <td>assertValue</td>
-       <td>vaadin=runcomvaadintestscomponentstableFooterClick::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTextField[0]</td>
+       <td>vaadin=runcomvaadintestscomponentstableFooterClick::PID_SClickedColumn</td>
        <td>col1</td>
 </tr>
+<tr>
+       <td>assertText</td>
+       <td>vaadin=runcomvaadintestscomponentstableFooterClick::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+       <td>4. Clicked on footer: col1</td>
+</tr>
+<!--Click on empty cell-->
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentstableFooterClick::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
-       <td>29,7</td>
+       <td>vaadin=runcomvaadintestscomponentstableFooterClick::PID_Stable/domChild[2]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]</td>
+       <td>69,12</td>
 </tr>
 <tr>
        <td>assertValue</td>
-       <td>vaadin=runcomvaadintestscomponentstableFooterClick::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTextField[0]</td>
+       <td>vaadin=runcomvaadintestscomponentstableFooterClick::PID_SClickedColumn</td>
        <td>col2</td>
 </tr>
+<tr>
+       <td>assertText</td>
+       <td>vaadin=runcomvaadintestscomponentstableFooterClick::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+       <td>5. Clicked on footer: col2</td>
+</tr>
+<!--Click on cell, not on text-->
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentstableFooterClick::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]</td>
-       <td>33,6</td>
+       <td>vaadin=runcomvaadintestscomponentstableFooterClick::PID_Stable/domChild[2]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
+       <td>19,3</td>
 </tr>
 <tr>
        <td>assertValue</td>
-       <td>vaadin=runcomvaadintestscomponentstableFooterClick::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTextField[0]</td>
+       <td>vaadin=runcomvaadintestscomponentstableFooterClick::PID_SClickedColumn</td>
        <td>col3</td>
 </tr>
+<tr>
+       <td>assertText</td>
+       <td>vaadin=runcomvaadintestscomponentstableFooterClick::PID_SLog/ChildComponentContainer[0]/VLabel[0]</td>
+       <td>6. Clicked on footer: col3</td>
+</tr>
 </tbody></table>
 </body>
 </html>

diff --git a/tests/src/com/vaadin/tests/components/table/FooterClick.java b/tests/src/com/vaadin/tests/components/table/FooterClick.java
index 363e18844bb3664466eb417859a678d10df94a44..b92d6ef362abd43ec35abe1d6915a01dbb353d32 100644 (file)
--- a/tests/src/com/vaadin/tests/components/table/FooterClick.java
+++ b/tests/src/com/vaadin/tests/components/table/FooterClick.java
@@ -4,6 +4,7 @@ import com.vaadin.data.Container;
 import com.vaadin.data.Item;
 import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.tests.components.TestBase;
+import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.CheckBox;
@@ -18,9 +19,12 @@ public class FooterClick extends TestBase {
     private final String COLUMN2_PROPERTY_ID = "col2";
     private final String COLUMN3_PROPERTY_ID = "col3";
 
+    private Log log = new Log(5);
+
     @Override
     protected void setup() {
         final Table table = new Table();
+        table.setDebugId("table");
         table.setContainerDataSource(createContainer());
         table.setWidth("400px");
         table.setHeight("400px");
@@ -29,16 +33,18 @@ public class FooterClick extends TestBase {
         table.setColumnReorderingAllowed(true);
 
         table.setColumnFooter(COLUMN1_PROPERTY_ID, "fuu");
-        table.setColumnFooter(COLUMN2_PROPERTY_ID, "bar");
+        // table.setColumnFooter(COLUMN2_PROPERTY_ID, "bar");
         table.setColumnFooter(COLUMN3_PROPERTY_ID, "fuubar");
 
         final TextField columnField = new TextField(
                 "ProperyId of clicked column");
+        columnField.setDebugId("ClickedColumn");
 
         // Add a footer click listener
         table.addListener(new Table.FooterClickListener() {
             public void footerClick(FooterClickEvent event) {
                 columnField.setValue(event.getPropertyId());
+                log.log("Clicked on footer: " + event.getPropertyId());
             }
         });
 
@@ -67,6 +73,8 @@ public class FooterClick extends TestBase {
         addComponent(immediateCheckbox);
         addComponent(columnReorderingCheckbox);
 
+        addComponent(log);
+
         addComponent(table);
         addComponent(columnField);
     }