Merge changes from 6.7 to 6.8

svn changeset:22090/svn branch:6.8

diff --git a/tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.java b/tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.java
index 0b972f07b26efa097557fc1e360e33045294bcdc..becae955ab882ef8849c46cd2c79d1dc0a07b6d3 100644 (file)
--- a/tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.java
+++ b/tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.java
@@ -1,15 +1,15 @@
 package com.vaadin.tests.components.treetable;
 
 import com.vaadin.terminal.ExternalResource;
-import com.vaadin.tests.components.TestBase;
+import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.TreeTable;
 import com.vaadin.ui.Window;
 
-public class DisappearingComponents extends TestBase {
+public class DisappearingComponents extends AbstractTestCase {
 
     @Override
-    protected void setup() {
+    public void init() {
         Window mainWindow = new Window("Application");
         final TreeTable tt = new TreeTable();
         tt.setSizeUndefined();