Fixed remaining warnings in /tests (#5749)

svn changeset:15444/svn branch:6.5

diff --git a/tests/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java b/tests/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java
index 2888972d253a88e8d0f30b3eea786aa79425a597..1fda9bafcabc0de4490a0ec720ef738773130a93 100644 (file)
--- a/tests/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java
+++ b/tests/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java
@@ -149,7 +149,7 @@ public class TestAbsoluteLayout extends TestBase {
                                 .next();\r
                         Item item = container.addItem(next);\r
 \r
-                        String caption = next.getTag();\r
+                        String caption = next.getClass().getSimpleName();\r
 \r
                         caption += "; cap: " + next.getCaption() + "; debugid"\r
                                 + getDebugId();\r

diff --git a/tests/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java b/tests/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java
index c6891e9d68dd8e1468c69925d77e6bce54a150d3..93c51d6b4ada1c2782ef90fa66986585f07de576 100644 (file)
--- a/tests/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java
+++ b/tests/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java
@@ -2,6 +2,7 @@ package com.vaadin.tests.layouts;
 
 import com.vaadin.event.LayoutEvents.LayoutClickEvent;
 import com.vaadin.event.LayoutEvents.LayoutClickListener;
+import com.vaadin.event.MouseEvents.ClickEvent;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.AbsoluteLayout;
@@ -141,9 +142,9 @@ public class TestLayoutClickListeners extends AbstractTestCase {
             }
         }
         String button = "left";
-        if (event.getButton() == event.BUTTON_RIGHT) {
+        if (event.getButton() == ClickEvent.BUTTON_RIGHT) {
             button = "right";
-        } else if (event.getButton() == event.BUTTON_MIDDLE) {
+        } else if (event.getButton() == ClickEvent.BUTTON_MIDDLE) {
             button = "middle";
 
         }

diff --git a/tests/src/com/vaadin/tests/server/applicationservlet/TestStaticFilesLocation.java b/tests/src/com/vaadin/tests/server/applicationservlet/TestStaticFilesLocation.java
index ed743ccedcdcf904bd0f95fd52cd3258c67fffaa..29ef40e5466375ea4174bbca8d6e5948625cbb4a 100644 (file)
--- a/tests/src/com/vaadin/tests/server/applicationservlet/TestStaticFilesLocation.java
+++ b/tests/src/com/vaadin/tests/server/applicationservlet/TestStaticFilesLocation.java
@@ -54,7 +54,7 @@ public class TestStaticFilesLocation extends TestCase {
             return null;
         }
 
-        public Enumeration getInitParameterNames() {
+        public Enumeration<Object> getInitParameterNames() {
             return new Enumeration<Object>() {
 
                 public boolean hasMoreElements() {

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1804.java b/tests/src/com/vaadin/tests/tickets/Ticket1804.java
index f1c37ac7857c48870573d9272bf902d97a7063ff..265f3041e97ed6a5667cff8080dde474559307eb 100644 (file)
--- a/tests/src/com/vaadin/tests/tickets/Ticket1804.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1804.java
@@ -5,7 +5,6 @@ import java.util.LinkedList;
 \r
 import com.vaadin.data.Validator;\r
 import com.vaadin.data.util.MethodProperty;\r
-import com.vaadin.terminal.Sizeable;\r
 import com.vaadin.terminal.SystemError;\r
 import com.vaadin.ui.AbstractField;\r
 import com.vaadin.ui.Button;\r
@@ -107,8 +106,7 @@ public class Ticket1804 extends com.vaadin.Application {
                 Window w = new Window("Status of the fields");\r
                 w.setModal(true);\r
                 w.setScrollable(true);\r
-                w.setHeight("80px");\r
-                w.setHeightUnits(Sizeable.UNITS_PERCENTAGE);\r
+                w.setHeight("80%");\r
                 w.addComponent(new Label(msg.toString(), Label.CONTENT_XHTML));\r
                 main.addWindow(w);\r
             }\r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2232.java b/tests/src/com/vaadin/tests/tickets/Ticket2232.java
index 848d3c8e3dfe45633ae4f458087ca669777a4bad..6df6717c33b376fb17043f29c31e1231116e4cfe 100644 (file)
--- a/tests/src/com/vaadin/tests/tickets/Ticket2232.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2232.java
@@ -66,7 +66,7 @@ public class Ticket2232 extends Application {
         }\r
         String caption = gl.getClass().getSimpleName();\r
         caption += " style: " + gl.getStyleName() + ", spacingFromServer:"\r
-                + ((SpacingHandler) gl).isSpacingEnabled();\r
+                + ((SpacingHandler) gl).isSpacing();\r
         gl.setCaption(caption);\r
         getMainWindow().addComponent(gl);\r
     }\r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2998.java b/tests/src/com/vaadin/tests/tickets/Ticket2998.java
index 88ee6dcc55f200d7ef363b1ab9f6836a88cdb33d..81ffcf5a016f058f1a89afc90bf34cd7de503d6d 100644 (file)
--- a/tests/src/com/vaadin/tests/tickets/Ticket2998.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2998.java
@@ -110,7 +110,7 @@ public class Ticket2998 extends Application {
             super("Edit workout");\r
             workoutLog = app;\r
             Layout main = new VerticalLayout();\r
-            setLayout(main);\r
+            setContent(main);\r
             main.setSizeUndefined();\r
             main.setStyleName(Reindeer.PANEL_LIGHT);\r
 \r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket677.java b/tests/src/com/vaadin/tests/tickets/Ticket677.java
index d288168d7c4ee1cc39dfc311daea486084db3567..ee7320e59b4be2266313c943b056a3c36a9921c1 100644 (file)
--- a/tests/src/com/vaadin/tests/tickets/Ticket677.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket677.java
@@ -5,7 +5,6 @@ import com.vaadin.data.Container;
 import com.vaadin.data.Item;\r
 import com.vaadin.data.Property;\r
 import com.vaadin.data.util.BeanItem;\r
-import com.vaadin.ui.BaseFieldFactory;\r
 import com.vaadin.ui.Button;\r
 import com.vaadin.ui.Button.ClickEvent;\r
 import com.vaadin.ui.Component;\r
@@ -109,7 +108,7 @@ public class Ticket677 extends Application {
 \r
         form = new Form();\r
         form.setCaption("Enabled");\r
-        form.setFieldFactory(new BaseFieldFactory() {\r
+        form.setFormFieldFactory(new DefaultFieldFactory() {\r
 \r
             @Override\r
             public Field createField(Item item, Object propertyId,\r