summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <tsuoanttila@users.noreply.github.com>2017-12-29 10:04:40 +0200
committerGitHub <noreply@github.com>2017-12-29 10:04:40 +0200
commitd5198e67ef0a1e72dda43f3a692cd52a1b6b9e93 (patch)
tree6dee2ef09ff4dd961529aacd360ddfeb4ef47b89 /test
parentdfa18c4cd112835244996607ad885c8682605dee (diff)
downloadvaadin-framework-d5198e67ef0a1e72dda43f3a692cd52a1b6b9e93.tar.gz
vaadin-framework-d5198e67ef0a1e72dda43f3a692cd52a1b6b9e93.zip
Remove workarounds from Spring integration test (#10430)
This patch makes the BOM use Spring 3.0.0.alpha1
Diffstat (limited to 'test')
-rw-r--r--test/pom.xml4
-rw-r--r--test/spring-boot-subcontext/src/main/java/com/example/CustomSpringNavigator.java19
-rw-r--r--test/spring-boot-subcontext/src/main/java/com/example/ui/AbstractSpringUI.java7
-rw-r--r--test/spring-boot-subcontext/src/test/java/com/example/VaadinSpringBootPushStateNavigatorIT.java7
-rw-r--r--test/spring-boot/src/main/java/com/example/CustomSpringNavigator.java19
-rw-r--r--test/spring-boot/src/main/java/com/example/ui/AbstractSpringUI.java7
-rw-r--r--test/spring-boot/src/test/java/com/example/VaadinSpringBootPushStateNavigatorIT.java7
7 files changed, 4 insertions, 66 deletions
diff --git a/test/pom.xml b/test/pom.xml
index 375581dc54..80a0a9e4ab 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -43,6 +43,10 @@
<id>vaadin-addons</id>
<url>http://maven.vaadin.com/vaadin-addons</url>
</repository>
+ <repository>
+ <id>vaadin-prereleases</id>
+ <url>http://maven.vaadin.com/vaadin-prereleases</url>
+ </repository>
</repositories>
<dependencyManagement>
diff --git a/test/spring-boot-subcontext/src/main/java/com/example/CustomSpringNavigator.java b/test/spring-boot-subcontext/src/main/java/com/example/CustomSpringNavigator.java
deleted file mode 100644
index fd11bb1473..0000000000
--- a/test/spring-boot-subcontext/src/main/java/com/example/CustomSpringNavigator.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.example;
-
-import org.springframework.stereotype.Component;
-
-import com.vaadin.navigator.ViewDisplay;
-import com.vaadin.spring.annotation.UIScope;
-import com.vaadin.spring.navigator.SpringNavigator;
-import com.vaadin.ui.UI;
-
-@UIScope
-@Component
-public class CustomSpringNavigator extends SpringNavigator {
-
- @Override
- public void init(UI ui, ViewDisplay display) {
- // FIXME: Should be in Spring plug-in
- init(ui, null, display);
- }
-}
diff --git a/test/spring-boot-subcontext/src/main/java/com/example/ui/AbstractSpringUI.java b/test/spring-boot-subcontext/src/main/java/com/example/ui/AbstractSpringUI.java
index 2549e7e8a8..9b1ddd82ed 100644
--- a/test/spring-boot-subcontext/src/main/java/com/example/ui/AbstractSpringUI.java
+++ b/test/spring-boot-subcontext/src/main/java/com/example/ui/AbstractSpringUI.java
@@ -52,11 +52,4 @@ abstract class AbstractSpringUI extends UI {
event -> getUI().getNavigator().navigateTo(viewName));
return button;
}
-
- @Override
- public String getUiRootPath() {
- // FIXME: Should be handled by Spring plug-in
- return super.getUiRootPath() + "/"
- + getClass().getAnnotation(SpringUI.class).path();
- }
}
diff --git a/test/spring-boot-subcontext/src/test/java/com/example/VaadinSpringBootPushStateNavigatorIT.java b/test/spring-boot-subcontext/src/test/java/com/example/VaadinSpringBootPushStateNavigatorIT.java
index 41692789f7..812fa00fee 100644
--- a/test/spring-boot-subcontext/src/test/java/com/example/VaadinSpringBootPushStateNavigatorIT.java
+++ b/test/spring-boot-subcontext/src/test/java/com/example/VaadinSpringBootPushStateNavigatorIT.java
@@ -6,13 +6,6 @@ import org.junit.Test;
public class VaadinSpringBootPushStateNavigatorIT
extends VaadinSpringBootURIFragmentNavigatorIT {
- @Ignore("PushState navigation is partially broken with Spring.")
- @Override
- @Test
- public void testNotDefaultView() {
- super.testNotDefaultView();
- }
-
@Override
protected String getPath() {
return "subpath";
diff --git a/test/spring-boot/src/main/java/com/example/CustomSpringNavigator.java b/test/spring-boot/src/main/java/com/example/CustomSpringNavigator.java
deleted file mode 100644
index fd11bb1473..0000000000
--- a/test/spring-boot/src/main/java/com/example/CustomSpringNavigator.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.example;
-
-import org.springframework.stereotype.Component;
-
-import com.vaadin.navigator.ViewDisplay;
-import com.vaadin.spring.annotation.UIScope;
-import com.vaadin.spring.navigator.SpringNavigator;
-import com.vaadin.ui.UI;
-
-@UIScope
-@Component
-public class CustomSpringNavigator extends SpringNavigator {
-
- @Override
- public void init(UI ui, ViewDisplay display) {
- // FIXME: Should be in Spring plug-in
- init(ui, null, display);
- }
-}
diff --git a/test/spring-boot/src/main/java/com/example/ui/AbstractSpringUI.java b/test/spring-boot/src/main/java/com/example/ui/AbstractSpringUI.java
index 2549e7e8a8..9b1ddd82ed 100644
--- a/test/spring-boot/src/main/java/com/example/ui/AbstractSpringUI.java
+++ b/test/spring-boot/src/main/java/com/example/ui/AbstractSpringUI.java
@@ -52,11 +52,4 @@ abstract class AbstractSpringUI extends UI {
event -> getUI().getNavigator().navigateTo(viewName));
return button;
}
-
- @Override
- public String getUiRootPath() {
- // FIXME: Should be handled by Spring plug-in
- return super.getUiRootPath() + "/"
- + getClass().getAnnotation(SpringUI.class).path();
- }
}
diff --git a/test/spring-boot/src/test/java/com/example/VaadinSpringBootPushStateNavigatorIT.java b/test/spring-boot/src/test/java/com/example/VaadinSpringBootPushStateNavigatorIT.java
index 41692789f7..812fa00fee 100644
--- a/test/spring-boot/src/test/java/com/example/VaadinSpringBootPushStateNavigatorIT.java
+++ b/test/spring-boot/src/test/java/com/example/VaadinSpringBootPushStateNavigatorIT.java
@@ -6,13 +6,6 @@ import org.junit.Test;
public class VaadinSpringBootPushStateNavigatorIT
extends VaadinSpringBootURIFragmentNavigatorIT {
- @Ignore("PushState navigation is partially broken with Spring.")
- @Override
- @Test
- public void testNotDefaultView() {
- super.testNotDefaultView();
- }
-
@Override
protected String getPath() {
return "subpath";