]> 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: 7c34499)
Merged test updates
authorArtur Signell <artur.signell@itmill.com>
Thu, 24 Sep 2009 12:04:57 +0000 (12:04 +0000)
committerArtur Signell <artur.signell@itmill.com>
Thu, 24 Sep 2009 12:04:57 +0000 (12:04 +0000)
svn changeset:8902/svn branch:6.2

src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html patch | blob | history
src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java patch | blob | history
src/com/vaadin/tests/components/link/LinkTargetSize.html [deleted file] patch | blob | history
src/com/vaadin/tests/components/window/SubwindowInvalidLayout.html [deleted file] patch | blob | history

diff --git a/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html b/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html
index ea49b92c6aa9dc62b3bb2827d8d11d2232b949a0..a37e8ea6623d21a6b8592e660f2e65ed603b02ce 100644 (file)
--- a/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html
+++ b/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html
@@ -21,11 +21,6 @@
        <td></td>
        <td></td>
 </tr>
-<tr>
-       <td>verifyTextPresent</td>
-       <td>Table containing Persons<br /><br /><br /><br />age<br /><br />firstName<br /><br />lastName<br /><br /><br /><br /><br />35<br />Jones<br />Birchman<br />30<br />Marc<br />Smith<br />75<br />Greg<br />Sandman</td>
-       <td></td>
-</tr>
 <tr>
        <td>screenCapture</td>
        <td></td>
diff --git a/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java b/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java
index 905e9a37c3f20f21beb130a7e32da4420b6f6ddf..4800316a5a50f32e8c6b737a0ada43f73e454a7d 100644 (file)
--- a/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java
+++ b/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.components.combobox;
 
 import com.vaadin.data.Item;
-import com.vaadin.terminal.ClassResource;
 import com.vaadin.terminal.Resource;
+import com.vaadin.terminal.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.ComboBox;
 
@@ -27,10 +27,10 @@ public class ComboBoxItemIcon extends TestBase {
 
         Item item = cb.addItem("FI");
         item.getItemProperty("icon").setValue(
-                new ClassResource("fi.gif", ComboBoxItemIcon.this));
+                new ThemeResource("../sampler/flags/fi.gif"));
         item = cb.addItem("SE");
         item.getItemProperty("icon").setValue(
-                new ClassResource("se.gif", ComboBoxItemIcon.this));
+                new ThemeResource("../sampler/flags/se.gif"));
 
     }
 
diff --git a/src/com/vaadin/tests/components/link/LinkTargetSize.html b/src/com/vaadin/tests/components/link/LinkTargetSize.html
deleted file mode 100644 (file)
index a288653..0000000
--- a/src/com/vaadin/tests/components/link/LinkTargetSize.html
+++ /dev/null
@@ -1,42 +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>LinkTargetSize</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">LinkTargetSize</td></tr>
-</thead><tbody>
-<tr>
-       <td>open</td>
-       <td>/run/com.vaadin.tests.components.link.LinkTargetSize</td>
-       <td></td>
-</tr>
-<tr>
-       <td>waitForVaadin</td>
-       <td></td>
-       <td></td>
-</tr>
-<tr>
-       <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentslinkLinkTargetSize::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLink[0]/domChild[0]/domChild[0]</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/src/com/vaadin/tests/components/window/SubwindowInvalidLayout.html b/src/com/vaadin/tests/components/window/SubwindowInvalidLayout.html
deleted file mode 100644 (file)
index 9d54eaf..0000000
--- a/src/com/vaadin/tests/components/window/SubwindowInvalidLayout.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>SubwindowInvalidLayout</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">SubwindowInvalidLayout</td></tr>
-</thead><tbody>
-<tr>
-       <td>open</td>
-       <td>/run/com.vaadin.tests.components.window.SubwindowInvalidLayout</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>
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework