From d5198e67ef0a1e72dda43f3a692cd52a1b6b9e93 Mon Sep 17 00:00:00 2001 From: Teemu Suo-Anttila Date: Fri, 29 Dec 2017 10:04:40 +0200 Subject: Remove workarounds from Spring integration test (#10430) This patch makes the BOM use Spring 3.0.0.alpha1 --- .../main/java/com/example/CustomSpringNavigator.java | 19 ------------------- .../main/java/com/example/ui/AbstractSpringUI.java | 7 ------- .../example/VaadinSpringBootPushStateNavigatorIT.java | 7 ------- 3 files changed, 33 deletions(-) delete mode 100644 test/spring-boot-subcontext/src/main/java/com/example/CustomSpringNavigator.java (limited to 'test/spring-boot-subcontext') 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"; -- cgit v1.2.3