summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2015-09-24 22:29:19 +0300
committerVaadin Code Review <review@vaadin.com>2015-09-29 14:00:23 +0000
commitf594b3aba5b89d7fe8231059125ffff57ca295b3 (patch)
tree0b9442636dc0ba9f6ad3a37d7a65c8880eced6fd /uitest
parentf71a6f1e5dc0b6bfbfb52739ad41a8064fe800ec (diff)
downloadvaadin-framework-f594b3aba5b89d7fe8231059125ffff57ca295b3.tar.gz
vaadin-framework-f594b3aba5b89d7fe8231059125ffff57ca295b3.zip
Skip checking unknown properties for @NoLayout on client side (#18334)
Change-Id: Ic03b419b8c10d5d7010c3d10479883149445fe40
Diffstat (limited to 'uitest')
-rw-r--r--uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptNoLayoutHandlingUI.java68
-rw-r--r--uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptNoLayoutHandlingUITest.java37
-rw-r--r--uitest/src/com/vaadin/tests/components/javascriptcomponent/MyJS.js7
3 files changed, 112 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptNoLayoutHandlingUI.java b/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptNoLayoutHandlingUI.java
new file mode 100644
index 0000000000..0181f17aba
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptNoLayoutHandlingUI.java
@@ -0,0 +1,68 @@
+/*
+ * 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;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+
+public class JavaScriptNoLayoutHandlingUI extends AbstractTestUIWithLog {
+
+ public static class MyJSComponentState extends JavaScriptComponentState {
+ // Using public methods as these are handled before public fields in the
+ // parent
+ private int aaa = 1;
+
+ public int getAaa() {
+ return aaa;
+ }
+
+ public void setAaa(int aaa) {
+ this.aaa = aaa;
+ }
+ }
+
+ @JavaScript("MyJS.js")
+ public static class MyJsComponent extends AbstractJavaScriptComponent {
+
+ @Override
+ protected MyJSComponentState getState() {
+ return (MyJSComponentState) super.getState();
+ }
+ }
+
+ @Override
+ protected void setup(VaadinRequest request) {
+ final MyJsComponent myComponent = new MyJsComponent();
+ myComponent.setId("js");
+ addComponent(myComponent);
+ addComponent(new Button("Send update", new ClickListener() {
+
+ @Override
+ public void buttonClick(ClickEvent event) {
+ myComponent.getState().aaa++;
+ }
+
+ }));
+
+ }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptNoLayoutHandlingUITest.java b/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptNoLayoutHandlingUITest.java
new file mode 100644
index 0000000000..3530eb1e16
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptNoLayoutHandlingUITest.java
@@ -0,0 +1,37 @@
+/*
+ * 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.Assert;
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class JavaScriptNoLayoutHandlingUITest extends MultiBrowserTest {
+
+ @Test
+ public void stateUpdate() {
+ openTestURL("debug");
+ WebElement js = findElement(By.id("js"));
+ Assert.assertEquals("state: 1", js.getText());
+ $(ButtonElement.class).first().click();
+
+ Assert.assertEquals("state: 2", js.getText());
+ }
+}
diff --git a/uitest/src/com/vaadin/tests/components/javascriptcomponent/MyJS.js b/uitest/src/com/vaadin/tests/components/javascriptcomponent/MyJS.js
new file mode 100644
index 0000000000..9876448311
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/javascriptcomponent/MyJS.js
@@ -0,0 +1,7 @@
+window.com_vaadin_tests_components_javascriptcomponent_JavaScriptNoLayoutHandlingUI_MyJsComponent = function() {
+ var e = this.getElement();
+
+ this.onStateChange = function() {
+ e.innerHTML = "state: "+this.getState().aaa;
+ }
+} \ No newline at end of file