diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-10-30 12:50:08 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-10-30 12:50:08 +0200 |
| commit | 88812ab9eed6b8e9babc3d9aac1cf13b5ee8750b (patch) | |
| tree | 374f23eb70dbe7087d2d1d45bdb501bddb25834b /uitest | |
| parent | 2364f3ec9fca600a5e926040ad3653de84bfed7d (diff) | |
| download | vaadin-framework-88812ab9eed6b8e9babc3d9aac1cf13b5ee8750b.tar.gz vaadin-framework-88812ab9eed6b8e9babc3d9aac1cf13b5ee8750b.zip | |
Avoid NPE if CustomComponent has no child (#9895)
Change-Id: I020951fb4490b09f5026b9d75de95d1661399e93
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentHideContent.html | 42 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentHideContent.java | 53 |
2 files changed, 95 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentHideContent.html b/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentHideContent.html new file mode 100644 index 0000000000..0616c10ab3 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentHideContent.html @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>New Test</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">New Test</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.customcomponent.CustomComponentHideContent?restartApplication</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestscomponentscustomcomponentCustomComponentHideContent::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertElementNotPresent</td> + <td>vaadin=runcomvaadintestscomponentscustomcomponentCustomComponentHideContent::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VCustomComponent[0]/VLabel[0]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestscomponentscustomcomponentCustomComponentHideContent::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentscustomcomponentCustomComponentHideContent::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VCustomComponent[0]/VLabel[0]</td> + <td>This is the content</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentHideContent.java b/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentHideContent.java new file mode 100644 index 0000000000..47dca9d57e --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentHideContent.java @@ -0,0 +1,53 @@ +/* + * Copyright 2012 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.customcomponent; + +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.CustomComponent; +import com.vaadin.ui.Label; + +public class CustomComponentHideContent extends AbstractTestUI { + + @Override + protected void setup(VaadinRequest request) { + final Label content = new Label("This is the content"); + CustomComponent customComponent = new CustomComponent(content); + addComponent(customComponent); + + addComponent(new Button("Toggle content visibility", + new Button.ClickListener() { + @Override + public void buttonClick(ClickEvent event) { + content.setVisible(!content.isVisible()); + } + })); + } + + @Override + protected String getTestDescription() { + return "Hiding the composition root of a CustomComponent should not cause client-side exceptions"; + } + + @Override + protected Integer getTicketNumber() { + return Integer.valueOf(9895); + } + +} |