From 9ee97bbf72551ba650e7ea910dddaae64f6c7ef0 Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Tue, 11 Aug 2015 10:17:07 +0300 Subject: Write true boolean attibutes without ='' (#17583) Also add missing test for GridLayout alignments Change-Id: If553c9e254fb754cb020a63013bfcc9ecae3a056 --- server/ivy.xml | 2 +- server/src/com/vaadin/ui/AbstractComponent.java | 12 +-- .../src/com/vaadin/ui/AbstractOrderedLayout.java | 10 +-- server/src/com/vaadin/ui/AbstractSplitPanel.java | 4 +- server/src/com/vaadin/ui/Button.java | 3 +- server/src/com/vaadin/ui/DragAndDropWrapper.java | 2 +- server/src/com/vaadin/ui/Grid.java | 3 +- server/src/com/vaadin/ui/GridLayout.java | 10 +-- server/src/com/vaadin/ui/Label.java | 2 +- server/src/com/vaadin/ui/MenuBar.java | 4 +- server/src/com/vaadin/ui/Slider.java | 2 +- server/src/com/vaadin/ui/Table.java | 4 +- server/src/com/vaadin/ui/Window.java | 4 +- .../ui/declarative/DesignAttributeHandler.java | 22 +++--- .../DragAndDropWrapperDeclarativeTest.java | 3 +- .../components/menubar/MenuBarDeclarativeTest.java | 22 +++--- .../design/AbstractComponentSetResponsiveTest.java | 4 +- .../tests/design/DeclarativeTestBaseBase.java | 13 +++- .../component/DeclarativeMarginTestBase.java | 10 +-- .../AbstractComponentDeclarativeTest.java | 30 +++---- .../AbstractFieldDeclarativeTest.java | 8 +- .../AbstractOrderedLayoutDeclarativeTest.java | 20 +++-- .../AbstractSelectDeclarativeTest.java | 12 +-- .../OptionGroupDeclarativeTests.java | 2 +- .../AbstractSplitPanelDeclarativeTest.java | 6 +- .../AbstractTextFieldDeclarativeTest.java | 2 +- .../component/audio/AudioDeclarativeTest.java | 2 +- .../component/audio/VideoDeclarativeTest.java | 2 +- .../component/button/ButtonDeclarativeTest.java | 8 +- .../checkbox/CheckboxDeclarativeTest.java | 4 +- .../AbstractColorPickerDeclarativeTest.java | 4 +- .../datefield/DateFieldDeclarativeTest.java | 2 +- .../declarative/GridColumnDeclarativeTest.java | 8 +- .../declarative/GridDeclarativeAttributeTest.java | 4 +- .../GridHeaderFooterDeclarativeTest.java | 91 ++++++++++------------ .../declarative/GridInlineDataDeclarativeTest.java | 14 ++-- .../gridlayout/GridLayoutDeclarativeTest.java | 26 +++++++ .../PasswordFieldDeclarativeTest.java | 2 +- .../popupview/PopupViewDeclarativeTest.java | 2 +- .../progressbar/ProgressBarDeclarativeTest.java | 5 +- .../richtextarea/RichTextAreaDeclarativeTest.java | 2 +- .../component/table/TableDeclarativeTest.java | 8 +- .../tabsheet/TabSheetDeclarativeTest.java | 10 +-- .../textfield/TextFieldDeclarativeTest.java | 2 +- .../treetable/TreeTableDeclarativeTest.java | 2 +- .../component/window/WindowDeclarativeTest.java | 19 +++-- 46 files changed, 237 insertions(+), 196 deletions(-) (limited to 'server') diff --git a/server/ivy.xml b/server/ivy.xml index 0711b4b2ea..b02ab123fb 100644 --- a/server/ivy.xml +++ b/server/ivy.xml @@ -60,7 +60,7 @@ - diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java index 42b36b0f21..d3506e9097 100644 --- a/server/src/com/vaadin/ui/AbstractComponent.java +++ b/server/src/com/vaadin/ui/AbstractComponent.java @@ -1176,16 +1176,16 @@ public abstract class AbstractComponent extends AbstractClientConnector // first try the full shorthands if (widthFull && heightFull) { - attributes.put("size-full", ""); + attributes.put("size-full", true); } else if (widthAuto && heightAuto) { - attributes.put("size-auto", ""); + attributes.put("size-auto", true); } else { // handle width if (!hasEqualWidth(defaultInstance)) { if (widthFull) { - attributes.put("width-full", ""); + attributes.put("width-full", true); } else if (widthAuto) { - attributes.put("width-auto", ""); + attributes.put("width-auto", true); } else { String widthString = DesignAttributeHandler.getFormatter() .format(getWidth()) + getWidthUnits().getSymbol(); @@ -1196,9 +1196,9 @@ public abstract class AbstractComponent extends AbstractClientConnector if (!hasEqualHeight(defaultInstance)) { // handle height if (heightFull) { - attributes.put("height-full", ""); + attributes.put("height-full", true); } else if (heightAuto) { - attributes.put("height-auto", ""); + attributes.put("height-auto", true); } else { String heightString = DesignAttributeHandler.getFormatter() .format(getHeight()) + getHeightUnits().getSymbol(); diff --git a/server/src/com/vaadin/ui/AbstractOrderedLayout.java b/server/src/com/vaadin/ui/AbstractOrderedLayout.java index afe4717212..e0dbcb004b 100644 --- a/server/src/com/vaadin/ui/AbstractOrderedLayout.java +++ b/server/src/com/vaadin/ui/AbstractOrderedLayout.java @@ -547,19 +547,19 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements // handle alignment Alignment alignment = getComponentAlignment(child); if (alignment.isMiddle()) { - childElement.attr(":middle", ""); + childElement.attr(":middle", true); } else if (alignment.isBottom()) { - childElement.attr(":bottom", ""); + childElement.attr(":bottom", true); } if (alignment.isCenter()) { - childElement.attr(":center", ""); + childElement.attr(":center", true); } else if (alignment.isRight()) { - childElement.attr(":right", ""); + childElement.attr(":right", true); } // handle expand ratio float expandRatio = getExpandRatio(child); if (expandRatio == 1.0f) { - childElement.attr(":expand", ""); + childElement.attr(":expand", true); } else if (expandRatio > 0) { childElement.attr(":expand", DesignAttributeHandler .getFormatter().format(expandRatio)); diff --git a/server/src/com/vaadin/ui/AbstractSplitPanel.java b/server/src/com/vaadin/ui/AbstractSplitPanel.java index cae98fd71d..271c4df571 100644 --- a/server/src/com/vaadin/ui/AbstractSplitPanel.java +++ b/server/src/com/vaadin/ui/AbstractSplitPanel.java @@ -735,7 +735,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { + getMaxSplitPositionUnit()); } if (getSplitterState().positionReversed) { - design.attr("reversed", ""); + design.attr("reversed", true); } // handle child components if (!designContext.shouldWriteChildren(this, def)) { @@ -750,7 +750,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { if (secondComponent != null) { Element childElement = designContext.createElement(secondComponent); if (firstComponent == null) { - childElement.attr(":second", ""); + childElement.attr(":second", true); } design.appendChild(childElement); } diff --git a/server/src/com/vaadin/ui/Button.java b/server/src/com/vaadin/ui/Button.java index 5c12f20479..cb8ba66217 100644 --- a/server/src/com/vaadin/ui/Button.java +++ b/server/src/com/vaadin/ui/Button.java @@ -22,7 +22,6 @@ import java.util.Collection; import org.jsoup.nodes.Attributes; import org.jsoup.nodes.Element; -import org.jsoup.parser.Parser; import com.vaadin.event.Action; import com.vaadin.event.ShortcutAction; @@ -635,7 +634,7 @@ public class Button extends AbstractFocusable implements } // plain-text (default is html) if (!isHtmlContentAllowed()) { - design.attr(DESIGN_ATTR_PLAIN_TEXT, ""); + design.attr(DESIGN_ATTR_PLAIN_TEXT, true); // encode HTML entities if (content != null) { design.html(DesignFormatter.encodeForTextNode(content)); diff --git a/server/src/com/vaadin/ui/DragAndDropWrapper.java b/server/src/com/vaadin/ui/DragAndDropWrapper.java index ba912f15dc..90b3b56ef6 100644 --- a/server/src/com/vaadin/ui/DragAndDropWrapper.java +++ b/server/src/com/vaadin/ui/DragAndDropWrapper.java @@ -491,7 +491,7 @@ public class DragAndDropWrapper extends CustomComponent implements DropTarget, if (getDragStartMode() == DragStartMode.COMPONENT_OTHER) { Element child = designContext .createElement(getDragImageComponent()); - child.attr(":drag-image", ""); + child.attr(":drag-image", true); design.appendChild(child); } } diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java index d44cb31cb0..c26e6d6705 100644 --- a/server/src/com/vaadin/ui/Grid.java +++ b/server/src/com/vaadin/ui/Grid.java @@ -2226,8 +2226,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, DesignContext designContext) { switch (cellState.type) { case TEXT: - DesignAttributeHandler.writeAttribute("plain-text", - cellElement.attributes(), "", null, String.class); + cellElement.attr("plain-text", true); cellElement.appendText(getText()); break; case HTML: diff --git a/server/src/com/vaadin/ui/GridLayout.java b/server/src/com/vaadin/ui/GridLayout.java index 7eb870d1f8..8517962e91 100644 --- a/server/src/com/vaadin/ui/GridLayout.java +++ b/server/src/com/vaadin/ui/GridLayout.java @@ -1512,14 +1512,14 @@ public class GridLayout extends AbstractLayout implements Alignment alignment = getComponentAlignment(child); if (alignment.isMiddle()) { - childElement.attr(":middle", ""); + childElement.attr(":middle", true); } else if (alignment.isBottom()) { - childElement.attr(":bottom", ""); + childElement.attr(":bottom", true); } if (alignment.isCenter()) { - childElement.attr(":center", ""); + childElement.attr(":center", true); } else if (alignment.isRight()) { - childElement.attr(":right", ""); + childElement.attr(":right", true); } col.appendChild(childElement); @@ -1659,4 +1659,4 @@ public class GridLayout extends AbstractLayout implements result.add("columns"); return result; } -} \ No newline at end of file +} diff --git a/server/src/com/vaadin/ui/Label.java b/server/src/com/vaadin/ui/Label.java index 79d9491ae9..2b96d51fa5 100644 --- a/server/src/com/vaadin/ui/Label.java +++ b/server/src/com/vaadin/ui/Label.java @@ -629,7 +629,7 @@ public class Label extends AbstractComponent implements Property, } // plain-text (default is html) if (getContentMode() == ContentMode.TEXT) { - design.attr(DESIGN_ATTR_PLAIN_TEXT, ""); + design.attr(DESIGN_ATTR_PLAIN_TEXT, true); design.html(DesignFormatter.encodeForTextNode(getValue())); } } diff --git a/server/src/com/vaadin/ui/MenuBar.java b/server/src/com/vaadin/ui/MenuBar.java index c11cf02aaf..9f05df7869 100644 --- a/server/src/com/vaadin/ui/MenuBar.java +++ b/server/src/com/vaadin/ui/MenuBar.java @@ -952,12 +952,12 @@ public class MenuBar extends AbstractComponent implements LegacyComponent, // in many cases there seems to be an empty more menu item if (getMoreMenuItem() != null && !getMoreMenuItem().getText().isEmpty()) { Element moreMenu = createMenuElement(getMoreMenuItem()); - moreMenu.attr("more", ""); + moreMenu.attr("more", true); design.appendChild(moreMenu); } if (!htmlContentAllowed) { - design.attr(DESIGN_ATTR_PLAIN_TEXT, ""); + design.attr(DESIGN_ATTR_PLAIN_TEXT, true); } } diff --git a/server/src/com/vaadin/ui/Slider.java b/server/src/com/vaadin/ui/Slider.java index 6b0880efd5..e85f634ac4 100644 --- a/server/src/com/vaadin/ui/Slider.java +++ b/server/src/com/vaadin/ui/Slider.java @@ -381,7 +381,7 @@ public class Slider extends AbstractField { public void writeDesign(Element design, DesignContext context) { super.writeDesign(design, context); if (getOrientation() == SliderOrientation.VERTICAL) { - design.attr("vertical", ""); + design.attr("vertical", true); } Slider defaultSlider = context.getDefaultInstance(this); DesignAttributeHandler.writeAttribute(this, "value", diff --git a/server/src/com/vaadin/ui/Table.java b/server/src/com/vaadin/ui/Table.java index 7f2a8e96e2..cbc216661a 100644 --- a/server/src/com/vaadin/ui/Table.java +++ b/server/src/com/vaadin/ui/Table.java @@ -6312,9 +6312,9 @@ public class Table extends AbstractSelect implements Action.Container, col.attr("property-id", id.toString()); if (getColumnAlignment(id) == Align.CENTER) { - col.attr("center", ""); + col.attr("center", true); } else if (getColumnAlignment(id) == Align.RIGHT) { - col.attr("right", ""); + col.attr("right", true); } DesignAttributeHandler.writeAttribute("width", col.attributes(), diff --git a/server/src/com/vaadin/ui/Window.java b/server/src/com/vaadin/ui/Window.java index 653a7d471c..b5cd384f53 100644 --- a/server/src/com/vaadin/ui/Window.java +++ b/server/src/com/vaadin/ui/Window.java @@ -1453,7 +1453,7 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier, Window def = context.getDefaultInstance(this); if (getState().centered) { - design.attr("center", ""); + design.attr("center", true); } DesignAttributeHandler.writeAttribute("position", design.attributes(), @@ -1481,7 +1481,7 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier, for (Component c : getAssistiveDescription()) { Element child = context.createElement(c).attr( - ":assistive-description", ""); + ":assistive-description", true); design.appendChild(child); } } diff --git a/server/src/com/vaadin/ui/declarative/DesignAttributeHandler.java b/server/src/com/vaadin/ui/declarative/DesignAttributeHandler.java index e93a5c51cb..cee2ebe381 100644 --- a/server/src/com/vaadin/ui/declarative/DesignAttributeHandler.java +++ b/server/src/com/vaadin/ui/declarative/DesignAttributeHandler.java @@ -117,8 +117,10 @@ public class DesignAttributeHandler implements Serializable { success = true; } } catch (Exception e) { - getLogger().log(Level.WARNING, - "Failed to set attribute " + attribute, e); + getLogger().log( + Level.WARNING, + "Failed to set value \"" + value + "\" to attribute " + + attribute, e); } if (!success) { getLogger().info( @@ -191,6 +193,7 @@ public class DesignAttributeHandler implements Serializable { * @param defaultInstance * the default instance for comparing default values */ + @SuppressWarnings({ "unchecked", "rawtypes" }) public static void writeAttribute(Object component, String attribute, Attributes attr, Object defaultInstance) { Method getter = findGetterForAttribute(component.getClass(), attribute); @@ -202,12 +205,8 @@ public class DesignAttributeHandler implements Serializable { // compare the value with default value Object value = getter.invoke(component); Object defaultValue = getter.invoke(defaultInstance); - // if the values are not equal, write the data - if (!SharedUtil.equals(value, defaultValue)) { - String attributeValue = toAttributeValue( - getter.getReturnType(), value); - attr.put(attribute, attributeValue); - } + writeAttribute(attribute, attr, value, defaultValue, + (Class) getter.getReturnType()); } catch (Exception e) { getLogger() .log(Level.SEVERE, @@ -240,7 +239,12 @@ public class DesignAttributeHandler implements Serializable { } if (!SharedUtil.equals(value, defaultValue)) { String attributeValue = toAttributeValue(inputType, value); - attributes.put(attribute, attributeValue); + if ("".equals(attributeValue) + && (inputType == boolean.class || inputType == Boolean.class)) { + attributes.put(attribute, true); + } else { + attributes.put(attribute, attributeValue); + } } } diff --git a/server/tests/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperDeclarativeTest.java b/server/tests/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperDeclarativeTest.java index 71373857fa..a590b3ec1f 100644 --- a/server/tests/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperDeclarativeTest.java +++ b/server/tests/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperDeclarativeTest.java @@ -56,7 +56,8 @@ public class DragAndDropWrapperDeclarativeTest extends String input = "" + new DesignContext().createElement(okButton) + new DesignContext().createElement(dragImage).attr( - ":drag-image", "") + ""; + ":drag-image", true) + + ""; DragAndDropWrapper wrapper = new DragAndDropWrapper(okButton); wrapper.setDragStartMode(DragStartMode.COMPONENT_OTHER); wrapper.setDragImageComponent(dragImage); diff --git a/server/tests/src/com/vaadin/tests/components/menubar/MenuBarDeclarativeTest.java b/server/tests/src/com/vaadin/tests/components/menubar/MenuBarDeclarativeTest.java index b131c5a21d..321d41152b 100644 --- a/server/tests/src/com/vaadin/tests/components/menubar/MenuBarDeclarativeTest.java +++ b/server/tests/src/com/vaadin/tests/components/menubar/MenuBarDeclarativeTest.java @@ -38,10 +38,10 @@ public class MenuBarDeclarativeTest extends DeclarativeTestBase { @Test // #16328 public void testReadWrite() throws IOException { - String design = "" - + "Save" + String design = "" + + "Save" + "Open" - + "Close" + + "Close" + "Help" + "About" + "SubItem" @@ -69,19 +69,19 @@ public class MenuBarDeclarativeTest extends DeclarativeTestBase { @Test // #16328 public void testTicketSpec1() throws IOException { - String design = " " + String design = " " + "File" + "Save" + "Open" - + "" - + "Exit" + + "" + + "Exit" + "Not for everybody" + "" + "Other" + "Sub" - + "Option 1 - no html" - + "Option 2" - + "Option 3" // + + "Option 1 - no html" + + "Option 2" + + "Option 3" // + "" // + "" // + "foo" @@ -124,7 +124,7 @@ public class MenuBarDeclarativeTest extends DeclarativeTestBase { + "File" + "Save" + "Open" - + "" + "Exit" // + + "" + "Exit" // + ""; MenuBar menuBar = new MenuBar(); menuBar.setHtmlContentAllowed(true); @@ -195,4 +195,4 @@ public class MenuBarDeclarativeTest extends DeclarativeTestBase { } } } -} \ No newline at end of file +} diff --git a/server/tests/src/com/vaadin/tests/design/AbstractComponentSetResponsiveTest.java b/server/tests/src/com/vaadin/tests/design/AbstractComponentSetResponsiveTest.java index b68f56218d..175a03cd78 100644 --- a/server/tests/src/com/vaadin/tests/design/AbstractComponentSetResponsiveTest.java +++ b/server/tests/src/com/vaadin/tests/design/AbstractComponentSetResponsiveTest.java @@ -28,9 +28,7 @@ public class AbstractComponentSetResponsiveTest extends Label label = new Label(); label.setContentMode(ContentMode.HTML); label.setResponsive(true); - - String design = ""; - + String design = ""; testWrite(design, label); testRead(design, label); } diff --git a/server/tests/src/com/vaadin/tests/design/DeclarativeTestBaseBase.java b/server/tests/src/com/vaadin/tests/design/DeclarativeTestBaseBase.java index 635b3e37cb..e7bb8955cf 100644 --- a/server/tests/src/com/vaadin/tests/design/DeclarativeTestBaseBase.java +++ b/server/tests/src/com/vaadin/tests/design/DeclarativeTestBaseBase.java @@ -21,10 +21,12 @@ import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.HashSet; import java.util.List; import org.jsoup.Jsoup; import org.jsoup.nodes.Attribute; +import org.jsoup.nodes.BooleanAttribute; import org.jsoup.nodes.Element; import org.jsoup.nodes.Node; import org.jsoup.nodes.TextNode; @@ -184,16 +186,23 @@ public abstract class DeclarativeTestBaseBase { * include close tags */ private String elementToHtml(Element producedElem, StringBuilder sb) { + HashSet booleanAttributes = new HashSet(); ArrayList names = new ArrayList(); for (Attribute a : producedElem.attributes().asList()) { names.add(a.getKey()); + if (a instanceof BooleanAttribute) { + booleanAttributes.add(a.getKey()); + } } Collections.sort(names); sb.append("<" + producedElem.tagName() + ""); for (String attrName : names) { - sb.append(" ").append(attrName).append("=").append("\'") - .append(producedElem.attr(attrName)).append("\'"); + sb.append(" ").append(attrName); + if (!booleanAttributes.contains(attrName)) { + sb.append("=").append("\'").append(producedElem.attr(attrName)) + .append("\'"); + } } sb.append(">"); for (Node child : producedElem.childNodes()) { diff --git a/server/tests/src/com/vaadin/tests/server/component/DeclarativeMarginTestBase.java b/server/tests/src/com/vaadin/tests/server/component/DeclarativeMarginTestBase.java index 42715e52ae..faaf8ebfc2 100644 --- a/server/tests/src/com/vaadin/tests/server/component/DeclarativeMarginTestBase.java +++ b/server/tests/src/com/vaadin/tests/server/component/DeclarativeMarginTestBase.java @@ -52,19 +52,19 @@ public abstract class DeclarativeMarginTestBase"; diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentDeclarativeTest.java index 15a667eb28..fc97c84952 100644 --- a/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentDeclarativeTest.java +++ b/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentDeclarativeTest.java @@ -71,7 +71,7 @@ public class AbstractComponentDeclarativeTest extends public void testProperties() { String design = "test-error\" immediate=\"\"/>"; + + "error=\"
test-error
\" immediate />"; component.setId("testId"); component.setPrimaryStyleName("test-style"); component.setCaption("test-caption"); @@ -89,8 +89,10 @@ public class AbstractComponentDeclarativeTest extends public void testReadImmediate() { // Additional tests for the immediate property, including // explicit immediate values - String[] design = { "", "", - "", "" }; + String[] design = { "", + "", + "", + "" }; Boolean[] explicitImmediate = { null, Boolean.FALSE, Boolean.TRUE, Boolean.TRUE }; boolean[] immediate = { false, false, true, true }; @@ -139,7 +141,7 @@ public class AbstractComponentDeclarativeTest extends @Test public void testSizeFull() { - String design = ""; + String design = ""; component.setSizeFull(); testRead(design, component); testWrite(design, component); @@ -147,7 +149,7 @@ public class AbstractComponentDeclarativeTest extends @Test public void testSizeAuto() { - String design = ""; + String design = ""; component.setSizeUndefined(); testRead(design, component); testWrite(design, component); @@ -155,7 +157,7 @@ public class AbstractComponentDeclarativeTest extends @Test public void testHeightFull() { - String design = ""; + String design = ""; component.setHeight("100%"); component.setWidth("20px"); testRead(design, component); @@ -164,7 +166,7 @@ public class AbstractComponentDeclarativeTest extends @Test public void testHeightAuto() { - String design = ""; + String design = ""; // we need to have default height of 100% -> use split panel AbstractComponent component = new HorizontalSplitPanel(); component.setHeight(null); @@ -175,7 +177,7 @@ public class AbstractComponentDeclarativeTest extends @Test public void testWidthFull() { - String design = "Foo"; + String design = "Foo"; AbstractComponent component = new Button(); component.setCaptionAsHtml(true); component.setCaption("Foo"); @@ -187,7 +189,7 @@ public class AbstractComponentDeclarativeTest extends @Test public void testWidthAuto() { - String design = ""; + String design = ""; component.setCaptionAsHtml(false); component.setHeight("20px"); component.setWidth(null); @@ -197,7 +199,7 @@ public class AbstractComponentDeclarativeTest extends @Test public void testResponsive() { - String design = ""; + String design = ""; Responsive.makeResponsive(component); testRead(design, component); testWrite(design, component); @@ -214,15 +216,15 @@ public class AbstractComponentDeclarativeTest extends public void testReadAlreadyResponsive() { AbstractComponent component = new Label(); Responsive.makeResponsive(component); - Element design = createDesign("responsive", ""); + Element design = createDesign(true); component.readDesign(design, new DesignContext()); assertEquals("Component should have only one extension", 1, component .getExtensions().size()); } - private Element createDesign(String key, String value) { + private Element createDesign(boolean responsive) { Attributes attributes = new Attributes(); - attributes.put(key, value); + attributes.put("responsive", responsive); Element node = new Element(Tag.valueOf("vaadin-label"), "", attributes); return node; } @@ -238,4 +240,4 @@ public class AbstractComponentDeclarativeTest extends "Getting the field explicitImmediateValue failed."); } } -} \ No newline at end of file +} diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldDeclarativeTest.java index a4ed0d364f..96ed8b6f1e 100644 --- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldDeclarativeTest.java +++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldDeclarativeTest.java @@ -33,9 +33,9 @@ public class AbstractFieldDeclarativeTest extends @Test public void testPlainText() { - String design = ""; + String design = ""; AbstractField tf = new TextField(); tf.setBuffered(true); tf.setBuffered(true); @@ -51,7 +51,7 @@ public class AbstractFieldDeclarativeTest extends testWrite(design, tf); // Test with readonly=false - design = design.replace("readonly=''", ""); + design = design.replace("readonly", ""); tf.setReadOnly(false); testRead(design, tf); testWrite(design, tf); diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java index b23083ab05..87f810d562 100644 --- a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java +++ b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java @@ -76,23 +76,31 @@ public class AbstractOrderedLayoutDeclarativeTest extends private String getDesign(float expandRatio, String... alignments) { String result = ""; result += " { public String getDesignSingleSelectNewItemsAllowed() { - return ""; } @@ -58,7 +58,7 @@ public class AbstractSelectDeclarativeTest extends } public String getDesignMultiSelect() { - return ""; + return ""; } public AbstractSelect getExpectedMultiSelect() { @@ -208,19 +208,19 @@ public class AbstractSelectDeclarativeTest extends private Element createDesignWithAttributesSingleSelect() { Attributes attributes = new Attributes(); - attributes.put("new-items-allowed", ""); + attributes.put("new-items-allowed", true); attributes.put("multi-select", "false"); attributes.put("item-caption-mode", "property"); attributes.put("item-caption-property-id", "name"); attributes.put("item-icon-property-id", "icon"); - attributes.put("null-selection-allowed", ""); + attributes.put("null-selection-allowed", true); attributes.put("null-selection-item-id", "No items selected"); return new Element(Tag.valueOf("vaadin-combo-box"), "", attributes); } private Element createDesignWithAttributesMultiSelect() { Attributes attributes = new Attributes(); - attributes.put("multi-select", ""); + attributes.put("multi-select", true); attributes.put("item-caption-mode", "EXPLICIT"); attributes.put("null-selection-allowed", "false"); return new Element(Tag.valueOf("vaadin-list-select"), "", attributes); @@ -302,4 +302,4 @@ public class AbstractSelectDeclarativeTest extends return ls; } -} \ No newline at end of file +} diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractselect/OptionGroupDeclarativeTests.java b/server/tests/src/com/vaadin/tests/server/component/abstractselect/OptionGroupDeclarativeTests.java index 92a8c12a9a..509e46c278 100644 --- a/server/tests/src/com/vaadin/tests/server/component/abstractselect/OptionGroupDeclarativeTests.java +++ b/server/tests/src/com/vaadin/tests/server/component/abstractselect/OptionGroupDeclarativeTests.java @@ -111,7 +111,7 @@ public class OptionGroupDeclarativeTests extends //@formatter:off String expected = - "" + "" + "" + "" + "" diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.java index 3ac8416762..02094cb611 100644 --- a/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.java +++ b/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.java @@ -38,8 +38,8 @@ public class AbstractSplitPanelDeclarativeTest extends @Test public void testWithBothChildren() { String design = " " + + "min-split-position=20% max-split-position=50px locked " + + "reversed> " + ""; AbstractSplitPanel sp = new HorizontalSplitPanel(); sp.setSplitPosition(20.5f, Unit.PERCENTAGE, true); @@ -83,4 +83,4 @@ public class AbstractSplitPanelDeclarativeTest extends testRead(design, sp); testWrite(design, sp); } -} \ No newline at end of file +} diff --git a/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldDeclarativeTest.java index 4d6411845e..275cca33a0 100644 --- a/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldDeclarativeTest.java +++ b/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldDeclarativeTest.java @@ -34,7 +34,7 @@ public class AbstractTextFieldDeclarativeTest extends @Test public void testAttributes() { String design = ""; AbstractTextField tf = new TextField(); diff --git a/server/tests/src/com/vaadin/tests/server/component/audio/AudioDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/audio/AudioDeclarativeTest.java index d1143ff0c1..f9bfd2d316 100644 --- a/server/tests/src/com/vaadin/tests/server/component/audio/AudioDeclarativeTest.java +++ b/server/tests/src/com/vaadin/tests/server/component/audio/AudioDeclarativeTest.java @@ -43,7 +43,7 @@ public class AudioDeclarativeTest extends DeclarativeTestBase