diff options
3 files changed, 105 insertions, 0 deletions
diff --git a/client/src/com/vaadin/client/ui/ui/UIConnector.java b/client/src/com/vaadin/client/ui/ui/UIConnector.java index 093b508aea..576f50d018 100644 --- a/client/src/com/vaadin/client/ui/ui/UIConnector.java +++ b/client/src/com/vaadin/client/ui/ui/UIConnector.java @@ -504,6 +504,18 @@ public class UIConnector extends AbstractSingleComponentContainerConnector return (VUI) super.getWidget(); } + @Override + protected ComponentConnector getContent() { + ComponentConnector connector = super.getContent(); + // VWindow (WindowConnector is its connector)is also a child component + // but it's never a content widget + if (connector instanceof WindowConnector) { + return null; + } else { + return connector; + } + } + protected void onChildSizeChange() { ComponentConnector child = getContent(); if (child == null) { diff --git a/uitest/src/com/vaadin/tests/components/window/WindowInUiWithNoContent.java b/uitest/src/com/vaadin/tests/components/window/WindowInUiWithNoContent.java new file mode 100644 index 0000000000..720f751cef --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/window/WindowInUiWithNoContent.java @@ -0,0 +1,49 @@ +/* + * Copyright 2000-2013 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.window; + +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.Window; + +/** + * Test UI for Window attached to the UI with not content. + * + * @since 7.2 + * @author Vaadin Ltd + */ +public class WindowInUiWithNoContent extends AbstractTestUI { + + @Override + protected void setup(VaadinRequest request) { + // This is requires for the test + setContent(null); + + Window window = new Window("window"); + addWindow(window); + } + + @Override + protected String getTestDescription() { + return "Client UI component should not use VWindow as a content component"; + } + + @Override + protected Integer getTicketNumber() { + return 13127; + } + +} diff --git a/uitest/src/com/vaadin/tests/components/window/WindowInUiWithNoContentTest.java b/uitest/src/com/vaadin/tests/components/window/WindowInUiWithNoContentTest.java new file mode 100644 index 0000000000..8378c8cf7b --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/window/WindowInUiWithNoContentTest.java @@ -0,0 +1,44 @@ +/* + * Copyright 2000-2013 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.window; + +import org.junit.Assert; +import org.junit.Test; +import org.openqa.selenium.WebElement; + +import com.vaadin.testbench.By; +import com.vaadin.tests.tb3.MultiBrowserTest; + +/** + * Test for Window attached to the UI with not content. + * + * @since 7.2 + * @author Vaadin Ltd + */ +public class WindowInUiWithNoContentTest extends MultiBrowserTest { + + @Test + public void testWindowInEmptyUI() { + openTestURL(); + + WebElement window = driver.findElement(By.className("v-window")); + String position = window.getCssValue("position"); + + Assert.assertEquals("Window element has non-absolute position and " + + "is broken in the UI", "absolute", position); + } + +} |