Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make FormLayout work with HTML captions (#17143)
Change-Id: I334441fd2f8d5f6d9e0629f5d7b564e9008f3fe5
- Loading branch information
Showing
3 changed files
with
114 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
uitest/src/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,43 @@ | |||
/* | |||
* 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.formlayout; | |||
|
|||
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.FormLayout; | |||
import com.vaadin.ui.TextField; | |||
|
|||
public class HtmlCaptionInFormLayout extends AbstractTestUI { | |||
@Override | |||
protected void setup(VaadinRequest request) { | |||
final TextField asHtml = new TextField("Contains <b>HTML</b>"); | |||
asHtml.setCaptionAsHtml(true); | |||
|
|||
final TextField asText = new TextField("Contains <b>HTML</b>"); | |||
|
|||
addComponent(new FormLayout(asHtml, asText)); | |||
|
|||
addComponent(new Button("Toggle", new Button.ClickListener() { | |||
@Override | |||
public void buttonClick(ClickEvent event) { | |||
asHtml.setCaptionAsHtml(!asHtml.isCaptionAsHtml()); | |||
asText.setCaptionAsHtml(!asText.isCaptionAsHtml()); | |||
} | |||
})); | |||
} | |||
} |
59 changes: 59 additions & 0 deletions
59
uitest/src/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayoutTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,59 @@ | |||
/* | |||
* 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.formlayout; | |||
|
|||
import java.util.List; | |||
|
|||
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.SingleBrowserTest; | |||
|
|||
public class HtmlCaptionInFormLayoutTest extends SingleBrowserTest { | |||
@Test | |||
public void testHtmlCaptions() { | |||
openTestURL(); | |||
|
|||
List<WebElement> captions = getDriver().findElements( | |||
By.cssSelector(".v-formlayout-captioncell span")); | |||
|
|||
Assert.assertEquals("Should be two formlayout captions", 2, | |||
captions.size()); | |||
|
|||
Assert.assertEquals("Contains HTML", captions.get(0).getText()); | |||
Assert.assertEquals("Contains <b>HTML</b>", captions.get(1).getText()); | |||
} | |||
|
|||
@Test | |||
public void testHtmlCaptionToggle() { | |||
openTestURL(); | |||
|
|||
$(ButtonElement.class).caption("Toggle").first().click(); | |||
|
|||
List<WebElement> captions = getDriver().findElements( | |||
By.cssSelector(".v-formlayout-captioncell span")); | |||
|
|||
Assert.assertEquals("Should be two formlayout captions", 2, | |||
captions.size()); | |||
|
|||
Assert.assertEquals("Contains <b>HTML</b>", captions.get(0).getText()); | |||
Assert.assertEquals("Contains HTML", captions.get(1).getText()); | |||
} | |||
|
|||
} |