]> 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: a39619a)
Made IE7ButtonWithIcon more general and added testing of buttons with all three themes
authorArtur Signell <artur.signell@itmill.com>
Wed, 5 Oct 2011 11:33:11 +0000 (11:33 +0000)
committerArtur Signell <artur.signell@itmill.com>
Wed, 5 Oct 2011 11:33:11 +0000 (11:33 +0000)
svn changeset:21573/svn branch:6.7

tests/testbench/com/vaadin/tests/components/button/Buttons-chameleon.html [new file with mode: 0644] patch | blob
tests/testbench/com/vaadin/tests/components/button/Buttons-reindeer.html [new file with mode: 0644] patch | blob
tests/testbench/com/vaadin/tests/components/button/Buttons-runo.html [new file with mode: 0644] patch | blob
tests/testbench/com/vaadin/tests/components/button/Buttons.html [deleted file] patch | blob | history
tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons-chameleon.html [new file with mode: 0644] patch | blob
tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons-reindeer.html [new file with mode: 0644] patch | blob
tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons-runo.html [new file with mode: 0644] patch | blob
tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons.java [new file with mode: 0644] patch | blob
tests/testbench/com/vaadin/tests/components/button/IE7ButtonWithIcon.html [deleted file] patch | blob | history
tests/testbench/com/vaadin/tests/components/button/IE7ButtonWithIcon.java [deleted file] patch | blob | history

diff --git a/tests/testbench/com/vaadin/tests/components/button/Buttons-chameleon.html b/tests/testbench/com/vaadin/tests/components/button/Buttons-chameleon.html
new file mode 100644 (file)
index 0000000..4830c79
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/button/Buttons-chameleon.html
@@ -0,0 +1,32 @@
+<?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>com.vaadin.tests.components.button.Buttons</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">com.vaadin.tests.components.button.Buttons</td></tr>
+</thead><tbody>
+<tr>
+       <td>open</td>
+       <td>/run/com.vaadin.tests.components.button.Buttons?theme=chameleon</td>
+       <td></td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/button/Buttons-reindeer.html b/tests/testbench/com/vaadin/tests/components/button/Buttons-reindeer.html
new file mode 100644 (file)
index 0000000..43e554b
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/button/Buttons-reindeer.html
@@ -0,0 +1,32 @@
+<?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>com.vaadin.tests.components.button.Buttons</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">com.vaadin.tests.components.button.Buttons</td></tr>
+</thead><tbody>
+<tr>
+       <td>open</td>
+       <td>/run/com.vaadin.tests.components.button.Buttons</td>
+       <td></td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/button/Buttons-runo.html b/tests/testbench/com/vaadin/tests/components/button/Buttons-runo.html
new file mode 100644 (file)
index 0000000..27779f1
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/button/Buttons-runo.html
@@ -0,0 +1,32 @@
+<?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>com.vaadin.tests.components.button.Buttons</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">com.vaadin.tests.components.button.Buttons</td></tr>
+</thead><tbody>
+<tr>
+       <td>open</td>
+       <td>/run/com.vaadin.tests.components.button.Buttons?theme=runo</td>
+       <td></td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/button/Buttons.html b/tests/testbench/com/vaadin/tests/components/button/Buttons.html
deleted file mode 100644 (file)
index 43e554b..0000000
--- a/tests/testbench/com/vaadin/tests/components/button/Buttons.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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>com.vaadin.tests.components.button.Buttons</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">com.vaadin.tests.components.button.Buttons</td></tr>
-</thead><tbody>
-<tr>
-       <td>open</td>
-       <td>/run/com.vaadin.tests.components.button.Buttons</td>
-       <td></td>
-</tr>
-<tr>
-       <td>waitForVaadin</td>
-       <td></td>
-       <td></td>
-</tr>
-<tr>
-       <td>screenCapture</td>
-       <td></td>
-       <td></td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons-chameleon.html b/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons-chameleon.html
new file mode 100644 (file)
index 0000000..5425ebb
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons-chameleon.html
@@ -0,0 +1,32 @@
+<?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>IE7ButtonWithIcon</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">ButtonsAndIcons</td></tr>
+</thead><tbody>
+<tr>
+       <td>open</td>
+       <td>/run/com.vaadin.tests.components.button.ButtonsAndIcons?theme=chameleon</td>
+       <td></td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons-reindeer.html b/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons-reindeer.html
new file mode 100644 (file)
index 0000000..6bee11d
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons-reindeer.html
@@ -0,0 +1,32 @@
+<?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>IE7ButtonWithIcon</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">ButtonsAndIcons</td></tr>
+</thead><tbody>
+<tr>
+       <td>open</td>
+       <td>/run/com.vaadin.tests.components.button.ButtonsAndIcons</td>
+       <td></td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons-runo.html b/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons-runo.html
new file mode 100644 (file)
index 0000000..8084a58
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons-runo.html
@@ -0,0 +1,32 @@
+<?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>IE7ButtonWithIcon</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">ButtonsAndIcons</td></tr>
+</thead><tbody>
+<tr>
+       <td>open</td>
+       <td>/run/com.vaadin.tests.components.button.ButtonsAndIcons?theme=runo</td>
+       <td></td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons.java b/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons.java
new file mode 100644 (file)
index 0000000..56fc5f2
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons.java
@@ -0,0 +1,49 @@
+package com.vaadin.tests.components.button;
+
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.NativeButton;
+
+public class ButtonsAndIcons extends TestBase {
+
+    @Override
+    protected String getDescription() {
+        return "The first button has text and an icon, the second only text and the third only an icon.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 3031;
+    }
+
+    @Override
+    protected void setup() {
+        Button b = new Button("Text and icon");
+        b.setIcon(new ThemeResource("../runo/icons/16/ok.png"));
+
+        addComponent(b);
+
+        b = new Button("Only text");
+
+        addComponent(b);
+        b = new Button(null);
+        b.setIcon(new ThemeResource("../runo/icons/16/ok.png"));
+
+        addComponent(b);
+
+        b = new NativeButton("Text and icon");
+        b.setIcon(new ThemeResource("../runo/icons/16/ok.png"));
+
+        addComponent(b);
+
+        b = new NativeButton("Only text");
+
+        addComponent(b);
+        b = new NativeButton(null);
+        b.setIcon(new ThemeResource("../runo/icons/16/ok.png"));
+
+        addComponent(b);
+    }
+
+}
diff --git a/tests/testbench/com/vaadin/tests/components/button/IE7ButtonWithIcon.html b/tests/testbench/com/vaadin/tests/components/button/IE7ButtonWithIcon.html
deleted file mode 100644 (file)
index a05b439..0000000
--- a/tests/testbench/com/vaadin/tests/components/button/IE7ButtonWithIcon.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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>IE7ButtonWithIcon</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">IE7ButtonWithIcon</td></tr>
-</thead><tbody>
-<tr>
-       <td>open</td>
-       <td>/run/com.vaadin.tests.components.button.IE7ButtonWithIcon</td>
-       <td></td>
-</tr>
-<tr>
-       <td>waitForVaadin</td>
-       <td></td>
-       <td></td>
-</tr>
-<tr>
-       <td>screenCapture</td>
-       <td></td>
-       <td></td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/tests/testbench/com/vaadin/tests/components/button/IE7ButtonWithIcon.java b/tests/testbench/com/vaadin/tests/components/button/IE7ButtonWithIcon.java
deleted file mode 100644 (file)
index c6a0ae9..0000000
--- a/tests/testbench/com/vaadin/tests/components/button/IE7ButtonWithIcon.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.vaadin.tests.components.button;
-
-import com.vaadin.terminal.ThemeResource;
-import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Button;
-
-public class IE7ButtonWithIcon extends TestBase {
-
-    @Override
-    protected String getDescription() {
-        return "The button should contain the text \"Normal\" and an 16x16 icon and have padding to the left and the right";
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        return 3031;
-    }
-
-    @Override
-    protected void setup() {
-        Button b = new Button("Normal");
-        b.setIcon(new ThemeResource("../runo/icons/16/ok.png"));
-
-        addComponent(b);
-    }
-
-}
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework