From 8fca887996e063470379dcf3b47d6bcff3c9839c Mon Sep 17 00:00:00 2001 From: Artur Date: Fri, 13 Jan 2017 10:26:11 +0200 Subject: Support for defining the root element for Javascript components (#8143) Fixes #7005 --- .../javascriptcomponent/JavaScriptSpan.java | 46 ++++++++++++++++++++++ .../javascriptcomponent/JavaScriptSpanComponent.js | 6 +++ .../javascriptcomponent/JavaScriptSpanTest.java | 31 +++++++++++++++ 3 files changed, 83 insertions(+) create mode 100644 uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptSpan.java create mode 100644 uitest/src/main/resources/com/vaadin/tests/components/javascriptcomponent/JavaScriptSpanComponent.js create mode 100644 uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptSpanTest.java (limited to 'uitest') diff --git a/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptSpan.java b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptSpan.java new file mode 100644 index 0000000000..7c1a79471b --- /dev/null +++ b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptSpan.java @@ -0,0 +1,46 @@ +/* + * Copyright 2000-2014 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.components.javascriptcomponent; + +import com.vaadin.annotations.JavaScript; +import com.vaadin.server.VaadinRequest; +import com.vaadin.shared.ui.JavaScriptComponentState; +import com.vaadin.tests.components.AbstractTestUIWithLog; +import com.vaadin.ui.AbstractJavaScriptComponent; + +public class JavaScriptSpan extends AbstractTestUIWithLog { + + @Override + protected void setup(VaadinRequest request) { + addComponent(new Span("Hello World")); + } + + @JavaScript("JavaScriptSpanComponent.js") + public static class Span extends AbstractJavaScriptComponent { + public Span(String text) { + this.getState().text = text; + } + + @Override + protected SpanState getState() { + return (SpanState) super.getState(); + } + } + + public static class SpanState extends JavaScriptComponentState { + public String text; + } +} diff --git a/uitest/src/main/resources/com/vaadin/tests/components/javascriptcomponent/JavaScriptSpanComponent.js b/uitest/src/main/resources/com/vaadin/tests/components/javascriptcomponent/JavaScriptSpanComponent.js new file mode 100644 index 0000000000..c217a10ed6 --- /dev/null +++ b/uitest/src/main/resources/com/vaadin/tests/components/javascriptcomponent/JavaScriptSpanComponent.js @@ -0,0 +1,6 @@ +com_vaadin_tests_components_javascriptcomponent_JavaScriptSpan_Span = function() { + this.onStateChange = function() { + this.getElement().innerText = this.getState().text; + } +} +com_vaadin_tests_components_javascriptcomponent_JavaScriptSpan_Span.tag = "span"; diff --git a/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptSpanTest.java b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptSpanTest.java new file mode 100644 index 0000000000..353a5e89f4 --- /dev/null +++ b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptSpanTest.java @@ -0,0 +1,31 @@ +/* + * Copyright 2000-2014 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.components.javascriptcomponent; + +import org.junit.Test; +import org.openqa.selenium.By; + +import com.vaadin.tests.tb3.SingleBrowserTest; + +public class JavaScriptSpanTest extends SingleBrowserTest { + @Test + public void componentShownAsSpan() { + openTestURL(); + + assertElementPresent(By.xpath("//span[text()='Hello World']")); + + } +} -- cgit v1.2.3