From 2b7c87b8b3e681a7fd56b32c4884559afde158fa Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Thu, 2 Feb 2012 15:23:26 +0000
Subject: #8311 Extended test to cover non-java files

svn changeset:22862/svn branch:6.7
---
 .../com/vaadin/tests/server/SourceFileChecker.java | 71 +++++++++++++++++-----
 1 file changed, 55 insertions(+), 16 deletions(-)

(limited to 'tests')

diff --git a/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java b/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java
index 5d39472712..51a2301be2 100644
--- a/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java
+++ b/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java
@@ -4,6 +4,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.HashSet;
+import java.util.Set;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
@@ -23,6 +24,13 @@ public class SourceFileChecker extends TestCase {
             + "tests/server-side";
     public static final String CLIENTSIDE_SRC_DIR = getBaseDir()
             + "tests/client-side";
+    private String externalJavaFiles = "com/vaadin/external";
+    private String buildFiles = "build";
+    private Set<String> alwaysIgnore = new HashSet<String>();
+    {
+        alwaysIgnore.add(".settings");
+        alwaysIgnore.add("eclipse");
+    }
 
     public static String getBaseDir() {
         if (baseDirectory != null) {
@@ -37,7 +45,7 @@ public class SourceFileChecker extends TestCase {
             }
         }
 
-        baseDirectory = "";
+        baseDirectory = "./";
         return baseDirectory;
     }
 
@@ -45,14 +53,31 @@ public class SourceFileChecker extends TestCase {
             TESTBENCH_SRC_DIR, SERVERSIDE_SRC_DIR, CLIENTSIDE_SRC_DIR };
 
     public void testJavaFilesContainsLicense() throws IOException {
-        validateJavaFiles(SRC_DIR, new LicenseChecker(),
-                "The following files are missing license information:\n{0}");
+        Set<String> ignore = new HashSet<String>(alwaysIgnore);
+        ignore.add(externalJavaFiles);
+        validateFiles(SRC_DIR, new LicenseChecker(), ignore,
+                "The following files are missing license information:\n{0}",
+                ".java");
+    }
+
+    public void testNonJavaFilesUseUnixNewline() throws IOException {
+        Set<String> ignore = new HashSet<String>(alwaysIgnore);
+        ignore.add(buildFiles);
+
+        for (String suffix : new String[] { ".html", ".css", ".xml" }) {
+            validateFiles(getBaseDir(), new DosNewlineDetector(), ignore,
+                    "The following files contain CRLF instead of LF:\n{0}",
+                    suffix);
+        }
     }
 
     public void testJavaFilesUseUnixNewline() throws IOException {
+        Set<String> ignore = new HashSet<String>(alwaysIgnore);
+        ignore.add(externalJavaFiles);
         for (String dir : ALL_SRC_DIRS) {
-            validateJavaFiles(dir, new DosNewlineDetector(),
-                    "The following files contain CRLF instead of LF:\n{0}");
+            validateFiles(dir, new DosNewlineDetector(), ignore,
+                    "The following files contain CRLF instead of LF:\n{0}",
+                    ".java");
         }
     }
 
@@ -60,27 +85,41 @@ public class SourceFileChecker extends TestCase {
         void validateFile(File f) throws Exception;
     }
 
-    private void validateJavaFiles(String directory, FileValidator validator,
-            String errorMessage) {
+    private void validateFiles(String directory, FileValidator validator,
+            Set<String> ignore, String errorMessage, String ending) {
         File srcDir = new File(directory);
         System.out.println(new File(".").getAbsolutePath());
         HashSet<String> missing = new HashSet<String>();
-        validateFiles(srcDir, missing, validator, ".java");
+        validateFiles(directory, srcDir, missing, validator, ending, ignore);
         if (!missing.isEmpty()) {
-            throw new RuntimeException(errorMessage.replace("{0}",
-                    missing.toString()));
+            throw new RuntimeException(errorMessage.replace("{0}", missing
+                    .toString().replace(',', '\n')));
         }
 
     }
 
-    private void validateFiles(File srcDir, HashSet<String> missing,
-            FileValidator validator, String suffix) {
-        Assert.assertTrue("Directory " + srcDir + " does not exist",
-                srcDir.exists());
+    private void validateFiles(String baseDirectory, File directory,
+            HashSet<String> missing, FileValidator validator, String suffix,
+            Set<String> ignores) {
+        Assert.assertTrue("Directory " + directory + " does not exist",
+                directory.exists());
+
+        for (File f : directory.listFiles()) {
+            boolean ignoreThis = false;
+            for (String ignore : ignores) {
+                if (new File(baseDirectory, ignore).equals(f)) {
+                    ignoreThis = true;
+                    continue;
+                }
+            }
+
+            if (ignoreThis) {
+                continue;
+            }
 
-        for (File f : srcDir.listFiles()) {
             if (f.isDirectory()) {
-                validateFiles(f, missing, validator, suffix);
+                validateFiles(baseDirectory, f, missing, validator, suffix,
+                        ignores);
             } else if (f.getName().endsWith(suffix)) {
                 try {
                     validator.validateFile(f);
-- 
cgit v1.2.3


From fbfa5fed3e2181f6b920f549fee6d341caaf90b8 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Thu, 2 Feb 2012 16:03:48 +0000
Subject: Removed debug info

svn changeset:22867/svn branch:6.7
---
 tests/server-side/com/vaadin/tests/server/SourceFileChecker.java | 1 -
 1 file changed, 1 deletion(-)

(limited to 'tests')

diff --git a/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java b/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java
index 51a2301be2..4fa4523927 100644
--- a/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java
+++ b/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java
@@ -88,7 +88,6 @@ public class SourceFileChecker extends TestCase {
     private void validateFiles(String directory, FileValidator validator,
             Set<String> ignore, String errorMessage, String ending) {
         File srcDir = new File(directory);
-        System.out.println(new File(".").getAbsolutePath());
         HashSet<String> missing = new HashSet<String>();
         validateFiles(directory, srcDir, missing, validator, ending, ignore);
         if (!missing.isEmpty()) {
-- 
cgit v1.2.3


From dec81152ae0f86d70668aa96d4ad26bc88e06a8d Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Fri, 3 Feb 2012 12:24:52 +0000
Subject: #8342 Test using Firefox 10

svn changeset:22876/svn branch:6.7
---
 tests/integration_tests.xml | 2 +-
 tests/test.xml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index be928aacf4..8acaa4eb98 100644
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -9,7 +9,7 @@
 	<fail unless="test.integration.antfile" message="test.integration.antfile must be set for integration tests to run" />
 
 	<!-- Test with these browsers -->
-	<property name="test_browsers" value="winxp-firefox9" />
+	<property name="test_browsers" value="winxp-firefox10" />
 
 	<!-- Path to key file. Default value -->
 	<property name="sshkey.file" value="id_dsa" />
diff --git a/tests/test.xml b/tests/test.xml
index 39d45d2a74..5322215c6d 100644
--- a/tests/test.xml
+++ b/tests/test.xml
@@ -5,7 +5,7 @@
 	<!-- Configuration                                                      -->
 	<!-- ================================================================== -->
 	<!-- Browsers to use for testing -->
-	<property name="browsers-windows" value="winxp-ie6,winxp-ie7,winxp-ie8,win7-ie9,winxp-firefox36,winxp-firefox9,winxp-safari4,winxp-safari5,winxp-googlechrome13,winxp-googlechrome-stable,winxp-opera1060,winxp-opera11" />
+	<property name="browsers-windows" value="winxp-ie6,winxp-ie7,winxp-ie8,win7-ie9,winxp-firefox36,winxp-firefox10,winxp-safari4,winxp-safari5,winxp-googlechrome13,winxp-googlechrome-stable,winxp-opera1060,winxp-opera11" />
 	<property name="browsers-linux" value="linux-firefox3,linux-opera10,linux-googlechrome8" />
 	<property name="browsers-mac" value="osx-firefox3,osx-opera10,osx-googlechrome8,osx-safari4,osx-safari5" />
 
-- 
cgit v1.2.3


From a4ee6072909e721a6062a3127421e44e88cf2271 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Fri, 3 Feb 2012 12:26:26 +0000
Subject: Reversed browser start logic, use --gui to start the browser
 automatically. By default does not start a browser.

svn changeset:22878/svn branch:6.7
---
 tests/testbench/com/vaadin/launcher/DevelopmentServerLauncher.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/testbench/com/vaadin/launcher/DevelopmentServerLauncher.java b/tests/testbench/com/vaadin/launcher/DevelopmentServerLauncher.java
index 0fb346736e..b3a7af42b9 100644
--- a/tests/testbench/com/vaadin/launcher/DevelopmentServerLauncher.java
+++ b/tests/testbench/com/vaadin/launcher/DevelopmentServerLauncher.java
@@ -64,7 +64,7 @@ public class DevelopmentServerLauncher {
         try {
             url = runServer(serverArgs, "Development Server Mode");
             // Start Browser
-            if (!serverArgs.containsKey("nogui") && url != null) {
+            if (serverArgs.containsKey("gui") && url != null) {
                 System.out.println("Starting Web Browser.");
 
                 // Open browser into application URL
-- 
cgit v1.2.3


From 798edf80a978b6357147f5c38b7e817b5373d432 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Fri, 3 Feb 2012 15:00:39 +0000
Subject: #8284, #8336 Fixed header and footer click for right and middle
 click. Browser context menu is also disabled on right click when there is a
 click listener.

svn changeset:22887/svn branch:6.7
---
 src/com/vaadin/terminal/gwt/client/Util.java       |  14 ++
 .../terminal/gwt/client/ui/VScrollTable.java       |  51 ++++---
 .../table/HeaderFooterClickLeftRightMiddle.html    |  92 ++++++++++++
 .../table/HeaderFooterClickLeftRightMiddle.java    | 154 +++++++++++++++++++++
 4 files changed, 294 insertions(+), 17 deletions(-)
 create mode 100644 tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.html
 create mode 100644 tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java

(limited to 'tests')

diff --git a/src/com/vaadin/terminal/gwt/client/Util.java b/src/com/vaadin/terminal/gwt/client/Util.java
index 3dbbd22329..60afcc2839 100644
--- a/src/com/vaadin/terminal/gwt/client/Util.java
+++ b/src/com/vaadin/terminal/gwt/client/Util.java
@@ -1321,4 +1321,18 @@ public class Util {
           cur = cur.parentNode;
         }
      }-*/;
+
+    /**
+     * Checks if the given event is either a touch event or caused by the left
+     * mouse button
+     * 
+     * @param event
+     * @return true if the event is a touch event or caused by the left mouse
+     *         button, false otherwise
+     */
+    public static boolean isTouchEventOrLeftMouseButton(Event event) {
+        int eventType = event.getTypeInt();
+        boolean touchEvent = Util.isTouchEvent(event);
+        return touchEvent || event.getButton() == Event.BUTTON_LEFT;
+    }
 }
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index f7d23d4453..cff25e00bf 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -2338,7 +2338,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
 
             DOM.appendChild(td, captionContainer);
 
-            DOM.sinkEvents(td, Event.MOUSEEVENTS | Event.TOUCHEVENTS);
+            DOM.sinkEvents(td, Event.MOUSEEVENTS | Event.ONDBLCLICK
+                    | Event.ONCONTEXTMENU | Event.TOUCHEVENTS);
 
             setElement(td);
 
@@ -2455,8 +2456,18 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
                         scrollBodyPanel.setFocus(true);
                     }
                     handleCaptionEvent(event);
-                    event.stopPropagation();
-                    event.preventDefault();
+                    boolean stopPropagation = true;
+                    if (event.getTypeInt() == Event.ONCONTEXTMENU
+                            && !client.hasEventListeners(VScrollTable.this,
+                                    HEADER_CLICK_EVENT_ID)) {
+                        // Prevent showing the browser's context menu only when
+                        // there is a header click listener.
+                        stopPropagation = false;
+                    }
+                    if (stopPropagation) {
+                        event.stopPropagation();
+                        event.preventDefault();
+                    }
                 }
             }
         }
@@ -2513,7 +2524,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
             switch (DOM.eventGetType(event)) {
             case Event.ONTOUCHSTART:
             case Event.ONMOUSEDOWN:
-                if (columnReordering) {
+                if (columnReordering
+                        && Util.isTouchEventOrLeftMouseButton(event)) {
                     if (event.getTypeInt() == Event.ONTOUCHSTART) {
                         /*
                          * prevent using this event in e.g. scrolling
@@ -2532,7 +2544,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
             case Event.ONMOUSEUP:
             case Event.ONTOUCHEND:
             case Event.ONTOUCHCANCEL:
-                if (columnReordering) {
+                if (columnReordering
+                        && Util.isTouchEventOrLeftMouseButton(event)) {
                     dragging = false;
                     DOM.releaseCapture(getElement());
                     if (moved) {
@@ -2592,14 +2605,6 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
                     break;
                 }
                 break;
-            case Event.ONCONTEXTMENU:
-                if (client.hasEventListeners(VScrollTable.this,
-                        HEADER_CLICK_EVENT_ID)) {
-                    // Prevent showing the browser's context menu when there is
-                    // a right click listener.
-                    event.preventDefault();
-                }
-                break;
             case Event.ONDBLCLICK:
                 fireHeaderClickedEvent(event);
                 break;
@@ -3338,7 +3343,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
 
             DOM.appendChild(td, captionContainer);
 
-            DOM.sinkEvents(td, Event.MOUSEEVENTS);
+            DOM.sinkEvents(td, Event.MOUSEEVENTS | Event.ONDBLCLICK
+                    | Event.ONCONTEXTMENU);
 
             setElement(td);
         }
@@ -3523,8 +3529,18 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
                 if (DOM.eventGetType(event) == Event.ONMOUSEUP) {
                     scrollBodyPanel.setFocus(true);
                 }
-                event.stopPropagation();
-                event.preventDefault();
+                boolean stopPropagation = true;
+                if (event.getTypeInt() == Event.ONCONTEXTMENU
+                        && !client.hasEventListeners(VScrollTable.this,
+                                FOOTER_CLICK_EVENT_ID)) {
+                    // Show browser context menu if a footer click listener is
+                    // not present
+                    stopPropagation = false;
+                }
+                if (stopPropagation) {
+                    event.stopPropagation();
+                    event.preventDefault();
+                }
             }
         }
 
@@ -3535,7 +3551,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
          *            The event to handle
          */
         protected void handleCaptionEvent(Event event) {
-            if (DOM.eventGetType(event) == Event.ONMOUSEUP) {
+            if (event.getTypeInt() == Event.ONMOUSEUP
+                    || event.getTypeInt() == Event.ONDBLCLICK) {
                 fireFooterClickedEvent(event);
             }
         }
diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.html b/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.html
new file mode 100644
index 0000000000..1ab1c61e88
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.html
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<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="" />
+<title>New Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">New Test</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.table.HeaderFooterClickLeftRightMiddle?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[5]/VScrollTable[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
+	<td>59,8</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::PID_SLog_row_0</td>
+	<td>1. Click on header col1 using left</td>
+</tr>
+<tr>
+	<td>mouseDownRight</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[5]/VScrollTable[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseUpRight</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[5]/VScrollTable[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::PID_SLog_row_0</td>
+	<td>2. Click on header col1 using right</td>
+</tr>
+<tr>
+	<td>doubleClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[5]/VScrollTable[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::PID_SLog_row_0</td>
+	<td>3. Double click on header col1 using left</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[5]/VScrollTable[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]</td>
+	<td>59,8</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::PID_SLog_row_0</td>
+	<td>4. Click on footer col2 using left</td>
+</tr>
+<tr>
+	<td>mouseDownRight</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[5]/VScrollTable[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseUpRight</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[5]/VScrollTable[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::PID_SLog_row_0</td>
+	<td>5. Click on footer col2 using right</td>
+</tr>
+<tr>
+	<td>doubleClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[5]/VScrollTable[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::PID_SLog_row_0</td>
+	<td>6. Double click on footer col2 using left</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java b/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java
new file mode 100644
index 0000000000..642067d826
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java
@@ -0,0 +1,154 @@
+package com.vaadin.tests.components.table;
+
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+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;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Table.FooterClickEvent;
+import com.vaadin.ui.Table.FooterClickListener;
+import com.vaadin.ui.Table.HeaderClickEvent;
+import com.vaadin.ui.Table.HeaderClickListener;
+
+public class HeaderFooterClickLeftRightMiddle extends TestBase {
+
+    private Log log = new Log(10);
+
+    @Override
+    protected void setup() {
+        final Table table = new Table();
+        table.setColumnReorderingAllowed(true);
+        table.setContainerDataSource(createContainer());
+        table.setWidth("400px");
+        table.setHeight("400px");
+        table.setImmediate(true);
+        table.setFooterVisible(true);
+
+        CheckBox immediateCheckbox = new CheckBox("Immediate");
+        immediateCheckbox.setImmediate(true);
+        immediateCheckbox.setValue(table.isImmediate());
+        immediateCheckbox.addListener(new ClickListener() {
+
+            public void buttonClick(ClickEvent event) {
+                table.setImmediate(event.getButton().booleanValue());
+            }
+        });
+
+        CheckBox headerClickListenerCheckbox = new CheckBox(
+                "Header click listener");
+        headerClickListenerCheckbox.setImmediate(true);
+        headerClickListenerCheckbox.addListener(new ValueChangeListener() {
+
+            private HeaderClickListener headerClickListener = new HeaderClickListener() {
+
+                public void headerClick(HeaderClickEvent event) {
+                    String type = event.isDoubleClick() ? "Double click"
+                            : "Click";
+                    log.log(type + " on header "
+                            + event.getPropertyId().toString() + " using "
+                            + event.getButtonName());
+                }
+
+            };
+
+            public void valueChange(ValueChangeEvent event) {
+                if (table.getListeners(HeaderClickEvent.class).isEmpty()) {
+                    table.addListener(headerClickListener);
+                } else {
+                    table.removeListener(headerClickListener);
+                }
+            }
+        });
+        headerClickListenerCheckbox.setValue(true);
+
+        CheckBox footerClickListenerCheckbox = new CheckBox(
+                "Footer click listener");
+        footerClickListenerCheckbox.setImmediate(true);
+        footerClickListenerCheckbox.addListener(new ValueChangeListener() {
+
+            private FooterClickListener footerClickListener = new FooterClickListener() {
+
+                public void footerClick(FooterClickEvent event) {
+                    String type = event.isDoubleClick() ? "Double click"
+                            : "Click";
+                    log.log(type + " on footer "
+                            + event.getPropertyId().toString() + " using "
+                            + event.getButtonName());
+                }
+            };
+
+            public void valueChange(ValueChangeEvent event) {
+                if (table.getListeners(FooterClickEvent.class).isEmpty()) {
+                    table.addListener(footerClickListener);
+                } else {
+                    table.removeListener(footerClickListener);
+                }
+            }
+        });
+        footerClickListenerCheckbox.setValue(true);
+
+        CheckBox sortEnabledCheckbox = new CheckBox("Sortable");
+        sortEnabledCheckbox.setImmediate(true);
+        sortEnabledCheckbox.setValue(!table.isSortDisabled());
+        sortEnabledCheckbox.addListener(new ClickListener() {
+
+            public void buttonClick(ClickEvent event) {
+                table.setSortDisabled(!event.getButton().booleanValue());
+            }
+        });
+
+        CheckBox columnReorderingCheckbox = new CheckBox(
+                "Column reordering allowed");
+        columnReorderingCheckbox.setImmediate(true);
+        columnReorderingCheckbox.setValue(table.isColumnReorderingAllowed());
+        columnReorderingCheckbox.addListener(new ClickListener() {
+
+            public void buttonClick(ClickEvent event) {
+                table.setColumnReorderingAllowed(event.getButton()
+                        .booleanValue());
+            }
+        });
+
+        addComponent(immediateCheckbox);
+        addComponent(headerClickListenerCheckbox);
+        addComponent(footerClickListenerCheckbox);
+        addComponent(sortEnabledCheckbox);
+        addComponent(columnReorderingCheckbox);
+        addComponent(table);
+        addComponent(log);
+
+    }
+
+    @Override
+    protected String getDescription() {
+        return "Tests the header click listener";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 4515;
+    }
+
+    private Container createContainer() {
+        IndexedContainer container = new IndexedContainer();
+        container.addContainerProperty("col1", String.class, "");
+        container.addContainerProperty("col2", String.class, "");
+        container.addContainerProperty("col3", String.class, "");
+
+        for (int i = 0; i < 100; i++) {
+            Item item = container.addItem("item " + i);
+            item.getItemProperty("col1").setValue("first" + i);
+            item.getItemProperty("col2").setValue("middle" + i);
+            item.getItemProperty("col3").setValue("last" + i);
+        }
+
+        return container;
+    }
+
+}
-- 
cgit v1.2.3


From 35079c30b8d3fde26dd27736c4a062d9bf3be9af Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Fri, 3 Feb 2012 15:22:17 +0000
Subject: Throw an error if directory listing fails

svn changeset:22890/svn branch:6.7
---
 tests/server-side/com/vaadin/tests/server/SourceFileChecker.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java b/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java
index 4fa4523927..3115ce49c8 100644
--- a/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java
+++ b/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java
@@ -103,7 +103,12 @@ public class SourceFileChecker extends TestCase {
         Assert.assertTrue("Directory " + directory + " does not exist",
                 directory.exists());
 
-        for (File f : directory.listFiles()) {
+        File[] files = directory.listFiles();
+        if (files == null) {
+            throw new RuntimeException("Listing of directory "
+                    + directory.getPath() + " failed");
+        }
+        for (File f : files) {
             boolean ignoreThis = false;
             for (String ignore : ignores) {
                 if (new File(baseDirectory, ignore).equals(f)) {
-- 
cgit v1.2.3


From 9d18b93a069503a9b9b90bd78836fde687af051d Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Fri, 3 Feb 2012 18:30:53 +0000
Subject: Fixed test - old IEs do not provide any button for double clicks

svn changeset:22899/svn branch:6.7
---
 .../tests/components/table/HeaderFooterClickLeftRightMiddle.html      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.html b/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.html
index 1ab1c61e88..dfd001bf5c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.html
+++ b/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.html
@@ -49,7 +49,7 @@
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::PID_SLog_row_0</td>
-	<td>3. Double click on header col1 using left</td>
+	<td>3. Double click on header col1 using*</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
@@ -84,7 +84,7 @@
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentstableHeaderFooterClickLeftRightMiddle::PID_SLog_row_0</td>
-	<td>6. Double click on footer col2 using left</td>
+	<td>6. Double click on footer col2 using*</td>
 </tr>
 
 </tbody></table>
-- 
cgit v1.2.3