From 326c6df209e0ed93f8a383c62107a377e37aaed9 Mon Sep 17 00:00:00 2001 From: kumm Date: Thu, 12 Jan 2017 17:40:33 +0100 Subject: [PATCH] unify of CONTRUCT_COUNT constant name --- .../com/vaadin/cdi/AbstractManagedCDIIntegrationTest.java | 4 +--- .../vaadin/cdi/CDIIntegrationWithDefaultDeploymentTest.java | 4 ++-- vaadin-cdi/src/test/java/com/vaadin/cdi/uis/RootUI.java | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/vaadin-cdi/src/test/java/com/vaadin/cdi/AbstractManagedCDIIntegrationTest.java b/vaadin-cdi/src/test/java/com/vaadin/cdi/AbstractManagedCDIIntegrationTest.java index 514050a0..96479a56 100644 --- a/vaadin-cdi/src/test/java/com/vaadin/cdi/AbstractManagedCDIIntegrationTest.java +++ b/vaadin-cdi/src/test/java/com/vaadin/cdi/AbstractManagedCDIIntegrationTest.java @@ -6,9 +6,7 @@ import org.jboss.arquillian.graphene.Graphene; import org.jboss.arquillian.test.api.ArquillianResource; import org.openqa.selenium.By; -import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.WebDriverWait; @@ -91,7 +89,7 @@ private String slurp(String uri) throws IOException { } public void assertDefaultRootNotInstantiated() throws IOException { - assertThat(getCount(RootUI.CONSTRUCT_KEY), is(0)); + assertThat(getCount(RootUI.CONSTRUCT_COUNT), is(0)); } } diff --git a/vaadin-cdi/src/test/java/com/vaadin/cdi/CDIIntegrationWithDefaultDeploymentTest.java b/vaadin-cdi/src/test/java/com/vaadin/cdi/CDIIntegrationWithDefaultDeploymentTest.java index 96b73658..9e45b7a9 100644 --- a/vaadin-cdi/src/test/java/com/vaadin/cdi/CDIIntegrationWithDefaultDeploymentTest.java +++ b/vaadin-cdi/src/test/java/com/vaadin/cdi/CDIIntegrationWithDefaultDeploymentTest.java @@ -108,9 +108,9 @@ public void oneToOneRelationBetweenBrowserAndUI() @Test public void rootUIDiscovery() throws IOException { - assertThat(getCount(RootUI.CONSTRUCT_KEY), is(0)); + assertThat(getCount(RootUI.CONSTRUCT_COUNT), is(0)); openWindow(""); - assertThat(getCount(RootUI.CONSTRUCT_KEY), is(1)); + assertThat(getCount(RootUI.CONSTRUCT_COUNT), is(1)); } @Test diff --git a/vaadin-cdi/src/test/java/com/vaadin/cdi/uis/RootUI.java b/vaadin-cdi/src/test/java/com/vaadin/cdi/uis/RootUI.java index 9dc997ac..01574a58 100644 --- a/vaadin-cdi/src/test/java/com/vaadin/cdi/uis/RootUI.java +++ b/vaadin-cdi/src/test/java/com/vaadin/cdi/uis/RootUI.java @@ -30,13 +30,13 @@ */ @CDIUI("") public class RootUI extends UI { - public static final String CONSTRUCT_KEY = "RootUIConstruct"; + public static final String CONSTRUCT_COUNT = "RootUIConstruct"; @Inject Counter counter; @PostConstruct public void initialize() { - counter.increment(CONSTRUCT_KEY); + counter.increment(CONSTRUCT_COUNT); } @Override