From c48fd3d872df347550fd9f2754713c06bb62b2cd Mon Sep 17 00:00:00 2001
From: Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com>
Date: Wed, 3 May 2017 12:53:52 +0300
Subject: Use correct TreeElement and server-side classname (#9221)

* Use correct TreeElement and server-side classname
* Re-enable test, remove unnecessary imports
---
 .../java/com/vaadin/tests/components/tree/TreeBasicFeaturesTest.java   | 3 ---
 .../test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java  | 2 +-
 uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java | 2 +-
 .../tests/components/tree/TreeItemSelectionWithoutImmediateTest.java   | 1 -
 .../vaadin/v7/tests/components/tree/TreeScrollingOnRightClickTest.java | 1 -
 5 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeBasicFeaturesTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeBasicFeaturesTest.java
index 455364eb41..682c2028d5 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeBasicFeaturesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeBasicFeaturesTest.java
@@ -5,7 +5,6 @@ import java.util.function.Predicate;
 
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.openqa.selenium.By;
 
@@ -55,8 +54,6 @@ public class TreeBasicFeaturesTest extends MultiBrowserTest {
     }
 
     @Test
-    // TODO: Re-enable once cache issue is fixed.
-    @Ignore("Recent change to cache invalidation broke resource clean up.")
     public void tree_expand_all_with_icons() throws IOException {
         selectMenuPath("Component", "Icons", "By Depth");
         Assert.assertTrue("Icon not present", $(TreeElement.class).first()
diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java
index 99cb978859..ba9114b8d4 100644
--- a/uitest/src/test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java
@@ -24,7 +24,7 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.TreeElement;
+import com.vaadin.v7.testbench.elements.TreeElement;
 
 public class TreeContextClickTest extends AbstractContextClickTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java
index 7dc8dcdd9b..4eeddff274 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java
@@ -26,9 +26,9 @@ import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elements.CssLayoutElement;
 import com.vaadin.testbench.elements.LabelElement;
-import com.vaadin.testbench.elements.TreeElement;
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.elements.TreeElement;
 
 public class ValoThemeUITest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeItemSelectionWithoutImmediateTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeItemSelectionWithoutImmediateTest.java
index 971bcb1619..a153a6d1f0 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeItemSelectionWithoutImmediateTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeItemSelectionWithoutImmediateTest.java
@@ -24,7 +24,6 @@ import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.By;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.tests.components.tree.TreeItemSelectionWithoutImmediate;
 
 public class TreeItemSelectionWithoutImmediateTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeScrollingOnRightClickTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeScrollingOnRightClickTest.java
index 573a08e187..f45210da4a 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeScrollingOnRightClickTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/tree/TreeScrollingOnRightClickTest.java
@@ -25,7 +25,6 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.tests.components.tree.TreeScrollingOnRightClick;
 
 /**
  *
-- 
cgit v1.2.3