Revert "Write true as attribute="" (#17519)"

This reverts commit cdc07e55c12dc4ffbe509e15c4f4f165fb4a1670.

Change-Id: Iad07a0292639d89c8f029c690005e7f1041eb79f

diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java
index f499cb1fec99d2aec88f363e781246d0d4e76e18..18c3509af70d5d8f923c066a3d41336461c21f55 100644 (file)
--- a/server/src/com/vaadin/ui/AbstractComponent.java
+++ b/server/src/com/vaadin/ui/AbstractComponent.java
@@ -1170,16 +1170,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();
@@ -1190,9 +1190,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/declarative/DesignFormatter.java b/server/src/com/vaadin/ui/declarative/DesignFormatter.java
index 73c45caed43514d6b15ab1baa7675be2cd531578..b1d252063119fa55e309f83fef308add83cae6d6 100644 (file)
--- a/server/src/com/vaadin/ui/declarative/DesignFormatter.java
+++ b/server/src/com/vaadin/ui/declarative/DesignFormatter.java
@@ -94,11 +94,7 @@ public class DesignFormatter implements Serializable {
             public String convertToPresentation(Boolean value,
                     Class<? extends String> targetType, Locale locale)
                     throws Converter.ConversionException {
-                if (value.booleanValue()) {
-                    return "";
-                } else {
-                    return "false";
-                }
+                return String.valueOf(value.booleanValue());
             }
 
             @Override

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 d058ae1dcdb0bef325132052ccf1becedc71806b..3bc1ebfbf9df836fa547038a0f757e113bbd88fb 100644 (file)
--- 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<MenuBar> {
     @Test
     // #16328
     public void testReadWrite() throws IOException {
-        String design = "<v-menu-bar auto-open='' tabindex=5>"
-                + "<menu checkable=''>Save</menu>"
+        String design = "<v-menu-bar auto-open='true' tabindex=5>"
+                + "<menu checkable='true'>Save</menu>"
                 + "<menu description='Open a file'>Open</menu>"
-                + "<menu disabled=''>Close</menu>"
+                + "<menu disabled='true'>Close</menu>"
                 + "<menu icon='http://foo.bar/ico.png'>Help</menu>"
                 + "<menu visible='false'>About</menu>"
                 + "<menu>Sub<menu>Item</menu></menu>"
@@ -69,19 +69,19 @@ public class MenuBarDeclarativeTest extends DeclarativeTestBase<MenuBar> {
     @Test
     // #16328
     public void testTicketSpec1() throws IOException {
-        String design = "<v-menu-bar auto-open='' plain-text tabindex=5> "
+        String design = "<v-menu-bar auto-open='true' plain-text tabindex=5> "
                 + "<menu>File"
                 + "<menu>Save</menu>"
                 + "<menu icon=\"theme://../runo/icons/16/folder.png\">Open</menu>"
-                + "<menu separator='' />"
-                + "<menu disabled=''>Exit</menu>"
+                + "<menu separator='true' />"
+                + "<menu disabled='true'>Exit</menu>"
                 + "<menu visible='false'>Not for everybody</menu>"
                 + "</menu>"
                 + "<menu description=\"This contains many items in sub menus\">Other"
                 + "<menu style-name=\"fancy\">Sub"
-                + "<menu checkable='' checked=''>Option 1 - no <b>html</b></menu>"
-                + "<menu checkable=''>Option 2</menu>"
-                + "<menu checkable=''>Option 3</menu>" //
+                + "<menu checkable='true' checked='true'>Option 1 - no <b>html</b></menu>"
+                + "<menu checkable='true'>Option 2</menu>"
+                + "<menu checkable='true'>Option 3</menu>" //
                 + "</menu>" //
                 + "</menu>" //
                 + "<menu more icon=\"theme://icon.png\">foo</menu>"
@@ -124,7 +124,8 @@ public class MenuBarDeclarativeTest extends DeclarativeTestBase<MenuBar> {
                 + "<menu><b>File</b>"
                 + "<menu><font style=\"color: red\">Save</font></menu>"
                 + "<menu icon=\"theme://../runo/icons/16/folder.png\">Open</menu>"
-                + "<menu separator='' />" + "<menu disabled=''>Exit</menu>" //
+                + "<menu separator='true' />"
+                + "<menu disabled='true'>Exit</menu>" //
                 + "</menu></v-menu-bar>";
         MenuBar menuBar = new MenuBar();
         menuBar.setHtmlContentAllowed(true);

diff --git a/server/tests/src/com/vaadin/tests/design/AbstractComponentSetResponsiveTest.java b/server/tests/src/com/vaadin/tests/design/AbstractComponentSetResponsiveTest.java
index 1119301c55a243ff13c7612647c6efb9b437be9b..83b3e577dc7ee93c8483f2ba9df64bc6cdc9cfd7 100644 (file)
--- a/server/tests/src/com/vaadin/tests/design/AbstractComponentSetResponsiveTest.java
+++ b/server/tests/src/com/vaadin/tests/design/AbstractComponentSetResponsiveTest.java
@@ -29,7 +29,7 @@ public class AbstractComponentSetResponsiveTest extends
         label.setContentMode(ContentMode.HTML);
         label.setResponsive(true);
 
-        String design = "<v-label responsive='' />";
+        String design = "<v-label responsive='true' />";
 
         testWrite(design, label);
         testRead(design, label);

diff --git a/server/tests/src/com/vaadin/tests/design/DesignFormatterTest.java b/server/tests/src/com/vaadin/tests/design/DesignFormatterTest.java
index acee3e2ca8e67e4d7573f980f1eda63af5899bf1..00af20ea8c1b68c6f4b607f52c796f17edea7309 100644 (file)
--- a/server/tests/src/com/vaadin/tests/design/DesignFormatterTest.java
+++ b/server/tests/src/com/vaadin/tests/design/DesignFormatterTest.java
@@ -78,7 +78,7 @@ public class DesignFormatterTest {
 
     @Test
     public void testBoolean() {
-        assertEquals("", formatter.format(true));
+        assertEquals("true", formatter.format(true));
         assertEquals("false", formatter.format(false));
 
         assertEquals(true, formatter.parse("true", boolean.class));

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 42715e52aec2ad038ba77b74f613e08e3c86094f..9fcb64acca9b47ee7b745cebd227d68de9e6496a 100644 (file)
--- 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<L extends Layout & MarginHandler
         String s = "<" + componentTag + " ";
 
         if (left && right && top && bottom) {
-            s += "margin=''";
+            s += "margin='true'";
         } else {
             if (left) {
-                s += "margin-left='' ";
+                s += "margin-left='true' ";
             }
             if (right) {
-                s += "margin-right='' ";
+                s += "margin-right='true' ";
             }
             if (top) {
-                s += "margin-top='' ";
+                s += "margin-top='true' ";
             }
             if (bottom) {
-                s += "margin-bottom='' ";
+                s += "margin-bottom='true' ";
             }
         }
         return s + " />";

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 71021a06e1f6f0a860638e7575f129d0b98c9555..4f45168a32cacfddd6dd7b75e30417d699e1b60c 100644 (file)
--- 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 = "<v-label id=\"testId\" primary-style-name=\"test-style\" "
                 + "caption=\"test-caption\" locale=\"fi_FI\" description=\"test-description\" "
-                + "error=\"<div>test-error</div>\" immediate=\"\"/>";
+                + "error=\"<div>test-error</div>\" immediate=\"true\"/>";
         component.setId("testId");
         component.setPrimaryStyleName("test-style");
         component.setCaption("test-caption");
@@ -139,7 +139,7 @@ public class AbstractComponentDeclarativeTest extends
 
     @Test
     public void testSizeFull() {
-        String design = "<v-label size-full=\"\"/>";
+        String design = "<v-label size-full=\"true\"/>";
         component.setSizeFull();
         testRead(design, component);
         testWrite(design, component);
@@ -147,7 +147,7 @@ public class AbstractComponentDeclarativeTest extends
 
     @Test
     public void testSizeAuto() {
-        String design = "<v-label size-auto=\"\"/>";
+        String design = "<v-label size-auto=\"true\"/>";
         component.setSizeUndefined();
         testRead(design, component);
         testWrite(design, component);
@@ -155,7 +155,7 @@ public class AbstractComponentDeclarativeTest extends
 
     @Test
     public void testHeightFull() {
-        String design = "<v-label height-full=\"\"/ width=\"20px\"/>";
+        String design = "<v-label height-full=\"true\"/ width=\"20px\"/>";
         component.setHeight("100%");
         component.setWidth("20px");
         testRead(design, component);
@@ -164,7 +164,7 @@ public class AbstractComponentDeclarativeTest extends
 
     @Test
     public void testHeightAuto() {
-        String design = "<v-horizontal-split-panel height-auto=\"\"/ width=\"20px\" >";
+        String design = "<v-horizontal-split-panel height-auto=\"true\"/ width=\"20px\" >";
         // we need to have default height of 100% -> use split panel
         AbstractComponent component = new HorizontalSplitPanel();
         component.setHeight(null);
@@ -175,7 +175,7 @@ public class AbstractComponentDeclarativeTest extends
 
     @Test
     public void testWidthFull() {
-        String design = "<v-button width-full=\"\"/ height=\"20px\">Foo</button>";
+        String design = "<v-button width-full=\"true\"/ height=\"20px\">Foo</button>";
         AbstractComponent component = new Button();
         component.setCaptionAsHtml(true);
         component.setCaption("Foo");
@@ -187,7 +187,7 @@ public class AbstractComponentDeclarativeTest extends
 
     @Test
     public void testWidthAuto() {
-        String design = "<v-label height=\"20px\"/ width-auto=\"\"/>";
+        String design = "<v-label height=\"20px\"/ width-auto=\"true\"/>";
         component.setCaptionAsHtml(false);
         component.setHeight("20px");
         component.setWidth(null);
@@ -197,7 +197,7 @@ public class AbstractComponentDeclarativeTest extends
 
     @Test
     public void testResponsive() {
-        String design = "<v-label responsive =\"\"/>";
+        String design = "<v-label responsive =\"true\"/>";
         Responsive.makeResponsive(component);
         testRead(design, component);
         testWrite(design, component);

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 b4afde592394cdaf8c2991d64b0d9d1fe4f0f1b8..55231e54944567024300710afa48b48cfc4b163b 100644 (file)
--- 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 = "<v-text-field buffered='' validation-visible='false' invalid-committed=''"
-                + " invalid-allowed='false' required='' required-error='This is a required field'"
-                + " conversion-error='Input {0} cannot be parsed' tabindex=3 readonly=''/>";
+        String design = "<v-text-field buffered='true' validation-visible='false' invalid-committed='true'"
+                + " invalid-allowed='false' required='true' required-error='This is a required field'"
+                + " conversion-error='Input {0} cannot be parsed' tabindex=3 readonly='true'/>";
         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='true'", "");
         tf.setReadOnly(false);
         testRead(design, tf);
         testWrite(design, tf);

diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java
index b294ffad72c633feaa5aabe0be53dc83043a0e8f..b3867a7a3a53188e9c71c9fda049ac55f39e5309 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java
@@ -42,7 +42,7 @@ public class AbstractSelectDeclarativeTest extends
         DeclarativeTestBase<AbstractSelect> {
 
     public String getDesignSingleSelectNewItemsAllowed() {
-        return "<v-combo-box new-items-allowed='' item-caption-mode='icon_only'"
+        return "<v-combo-box new-items-allowed='true' item-caption-mode='icon_only'"
                 + " null-selection-item-id='nullIid'/>";
 
     }
@@ -57,7 +57,7 @@ public class AbstractSelectDeclarativeTest extends
     }
 
     public String getDesignMultiSelect() {
-        return "<v-list-select multi-select='' null-selection-allowed='false' new-items-allowed='' item-caption-mode='property' />";
+        return "<v-list-select multi-select='true' null-selection-allowed='false' new-items-allowed='true' item-caption-mode='property' />";
     }
 
     public AbstractSelect getExpectedMultiSelect() {
@@ -210,7 +210,7 @@ public class AbstractSelectDeclarativeTest extends
         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("v-combo-box"), "", attributes);
     }
@@ -231,7 +231,7 @@ public class AbstractSelectDeclarativeTest extends
         assertEquals("Wrong caption for the combo box.", "A combo box",
                 e.attr("caption"));
         Assert.assertTrue("Adding new items should be allowed.",
-                "".equals(e.attr("new-items-allowed")));
+                "true".equals(e.attr("new-items-allowed")));
         assertEquals("Wrong item caption mode.", "icon_only",
                 e.attr("item-caption-mode"));
         assertEquals("Wrong item icon property id.", "icon",

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 efcdc3e9978ffaa183a9c13a3e545616bc551ebc..4d75e0b59feeeb88d11aaf0f70fbfec1b5efc6ed 100644 (file)
--- 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 = 
-                "<v-option-group html-content-allowed=''>"
+                "<v-option-group html-content-allowed='true'>"
                 + "<option item-id=\"foo\"><b>True</b></option>"
                 + "<option item-id=\"bar\"><font color='red'>False</font></option>"
                 + "<option>baz</option>"

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 11d97d191bca1072548af72bc4b8ad1b680908db..2d6db6d19a12ced65930b66798aaf662ed66c6bf 100644 (file)
--- 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,7 +38,7 @@ public class AbstractSplitPanelDeclarativeTest extends
     @Test
     public void testWithBothChildren() {
         String design = "<v-horizontal-split-panel split-position=20.5% "
-                + "min-split-position=20% max-split-position=50px locked='' "
+                + "min-split-position=20% max-split-position=50px locked=true "
                 + "reversed=\"\"> <v-table /> <v-vertical-layout />"
                 + "</v-horizontal-split-panel>";
         AbstractSplitPanel sp = new HorizontalSplitPanel();

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 b8e570bc89bf30fad30e44b526ddf702b0dffb3a..a3594b715971e0151a6b54b71e9c14568767f061 100644 (file)
--- 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 = "<v-text-field null-representation=this-is-null "
-                + "null-setting-allowed='' maxlength=5 columns=3 "
+                + "null-setting-allowed=true maxlength=5 columns=3 "
                 + "input-prompt=input text-change-event-mode=eager "
                 + "text-change-timeout=100 />";
         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 ec2b5241f3f8a809b22c06e23a21513796a8b71a..4390499c4ee4b5d6ed7c41bfd63bf326ae5a18be 100644 (file)
--- 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<Audio> {
 
     @Test
     public void testAudioMultipleSources() {
-        String design = "<v-audio muted='' show-controls='false'>"
+        String design = "<v-audio muted='true' show-controls='false'>"
                 + "some <b>text</b>" //
                 + "<source href='http://foo.pl' />"
                 + "<source href='https://bar.pl' />" //

diff --git a/server/tests/src/com/vaadin/tests/server/component/audio/VideoDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/audio/VideoDeclarativeTest.java
index 5be70bd2db04495590e9bafbac0238f5a28527a1..fc0b3d9512b5e180b77dae67f87ee6b1a2b1c94e 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/audio/VideoDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/audio/VideoDeclarativeTest.java
@@ -36,7 +36,7 @@ public class VideoDeclarativeTest extends DeclarativeTestBase<Video> {
 
     @Test
     public void testVideoMultipleSources() {
-        String design = "<v-video muted='' show-controls='false'>"
+        String design = "<v-video muted='true' show-controls='false'>"
                 + "some <b>text</b>" //
                 + "<source href='http://foo.pl' />"
                 + "<source href='https://bar.pl' />" //

diff --git a/server/tests/src/com/vaadin/tests/server/component/checkbox/CheckboxDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/checkbox/CheckboxDeclarativeTest.java
index e0f0b7c3e90e7227382c355559ac36605bd00ae7..6162e41494b09389676c89525663edb97460089c 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/checkbox/CheckboxDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/checkbox/CheckboxDeclarativeTest.java
@@ -38,7 +38,7 @@ public class CheckboxDeclarativeTest extends DeclarativeTestBase<CheckBox> {
 
     @Test
     public void testUnchecked() {
-        String design = "<v-check-box checked='' />";
+        String design = "<v-check-box checked='true' />";
         CheckBox checkBox = new CheckBox();
         checkBox.setValue(true);
         testRead(design, checkBox);

diff --git a/server/tests/src/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java
index 33521d3af261aaa29b5d4cfa1bd1883a71e8687a..59b2efdc422169303e1cb77df5e166271d989be1 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java
@@ -29,7 +29,7 @@ public class AbstractColorPickerDeclarativeTest extends
 
     @Test
     public void testAllAbstractColorPickerFeatures() {
-        String design = "<v-color-picker color='#fafafa' default-caption-enabled='' position='100,100'"
+        String design = "<v-color-picker color='#fafafa' default-caption-enabled='true' position='100,100'"
                 + " popup-style='simple' rgb-visibility='false' hsv-visibility='false'"
                 + " history-visibility=false textfield-visibility=false />";
         ColorPicker colorPicker = new ColorPicker();
@@ -58,7 +58,7 @@ public class AbstractColorPickerDeclarativeTest extends
 
     @Test
     public void testAllAbstractColorPickerAreaFeatures() {
-        String design = "<v-color-picker-area color='#fafafa' default-caption-enabled='' position='100,100'"
+        String design = "<v-color-picker-area color='#fafafa' default-caption-enabled='true' position='100,100'"
                 + " popup-style='simple' rgb-visibility='false' hsv-visibility='false'"
                 + " history-visibility=false textfield-visibility=false />";
         AbstractColorPicker colorPicker = new ColorPickerArea();

diff --git a/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldDeclarativeTest.java
index 4087f1ad11612c7044a6147741a103d7d5d959a3..5058cf5a5ffe39d83f4ef4bf4a99096cad9f5f0c 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldDeclarativeTest.java
@@ -44,7 +44,7 @@ public class DateFieldDeclarativeTest extends DeclarativeTestBase<DateField> {
     }
 
     private String getTimezoneDesign() {
-        return "<v-date-field range-start=\"2014-05-05 00:00:00+0300\" range-end=\"2014-06-05 00:00:00+0300\" date-out-of-range-message=\"Please select a sensible date\" date-format=\"yyyy-MM-dd\" lenient='' show-iso-week-numbers='' parse-error-message=\"You are doing it wrong\" time-zone=\"GMT+05:00\" value=\"2014-05-15 00:00:00+0300\"/>";
+        return "<v-date-field range-start=\"2014-05-05 00:00:00+0300\" range-end=\"2014-06-05 00:00:00+0300\" date-out-of-range-message=\"Please select a sensible date\" date-format=\"yyyy-MM-dd\" lenient='true' show-iso-week-numbers='true' parse-error-message=\"You are doing it wrong\" time-zone=\"GMT+05:00\" value=\"2014-05-15 00:00:00+0300\"/>";
     }
 
     private DateField getTimezoneExpected() {

diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java
index aa9a4994698d44476ce17e3bf770dc7c7cf575f5..6cf9ef55add095a434d3762d41bd313fed1912e3 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java
@@ -25,11 +25,11 @@ public class GridColumnDeclarativeTest extends GridDeclarativeTestBase {
     public void testSimpleGridColumns() {
         String design = "<v-grid><table>"//
                 + "<colgroup>"
-                + "   <col sortable='' width='100' property-id='Column1'>"
+                + "   <col sortable=true width='100' property-id='Column1'>"
                 + "   <col sortable=false max-width='200' expand='2' property-id='Column2'>"
-                + "   <col sortable='' editable=false min-width='15' expand='1' property-id='Column3'>"
-                + "   <col sortable='' hidable='' hiding-toggle-caption='col 4' property-id='Column4'>"
-                + "   <col sortable='' hidden='' property-id='Column5'>"
+                + "   <col sortable=true editable=false min-width='15' expand='1' property-id='Column3'>"
+                + "   <col sortable=true hidable=true hiding-toggle-caption='col 4' property-id='Column4'>"
+                + "   <col sortable=true hidden=true property-id='Column5'>"
                 + "</colgroup>" //
                 + "<thead />" //
                 + "</table></v-grid>";

diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java b/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java
index 43f394eafc6797c9a26b10404dda72c8701bb757..8ffe749f6feeebf8984af01d424cc048b221e139 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java
@@ -37,8 +37,8 @@ public class GridDeclarativeAttributeTest extends DeclarativeTestBase<Grid> {
     @Test
     public void testBasicAttributes() {
 
-        String design = "<v-grid editable='' rows=20 frozen-columns=-1 "
-                + "editor-save-caption='Tallenna' editor-cancel-caption='Peruuta' column-reordering-allowed=''>";
+        String design = "<v-grid editable='true' rows=20 frozen-columns=-1 "
+                + "editor-save-caption='Tallenna' editor-cancel-caption='Peruuta' column-reordering-allowed=true>";
 
         Grid grid = new Grid();
         grid.setEditorEnabled(true);

diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java
index 8e1d880c5e89542bd32130ae8e8b785764ab280c..b4e82950cb71d49bd184f1380aceea1afd3c2a00 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java
@@ -30,12 +30,12 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
     public void testSingleDefaultHeader() {
         String design = "<v-grid><table>"//
                 + "<colgroup>"
-                + "   <col sortable='' property-id='Column1'>"
-                + "   <col sortable='' property-id='Column2'>"
-                + "   <col sortable='' property-id='Column3'>"
+                + "   <col sortable=true property-id='Column1'>"
+                + "   <col sortable=true property-id='Column2'>"
+                + "   <col sortable=true property-id='Column3'>"
                 + "</colgroup>" //
                 + "<thead>" //
-                + "   <tr default=''><th plain-text=''>Column1<th plain-text=''>Column2<th plain-text=''>Column3</tr>" //
+                + "   <tr default='true'><th plain-text=''>Column1<th plain-text=''>Column2<th plain-text=''>Column3</tr>" //
                 + "</thead>" //
                 + "</table></v-grid>";
         Grid grid = new Grid();
@@ -51,11 +51,12 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
     public void testSingleDefaultHTMLHeader() {
         String design = "<v-grid><table>"//
                 + "<colgroup>"
-                + "   <col sortable='' property-id='Column1'>"
-                + "   <col sortable='' property-id='Column2'>"
-                + "   <col sortable='' property-id='Column3'>" + "</colgroup>" //
+                + "   <col sortable=true property-id='Column1'>"
+                + "   <col sortable=true property-id='Column2'>"
+                + "   <col sortable=true property-id='Column3'>"
+                + "</colgroup>" //
                 + "<thead>" //
-                + "   <tr default=''><th>Column1<th>Column2<th>Column3</tr>" //
+                + "   <tr default='true'><th>Column1<th>Column2<th>Column3</tr>" //
                 + "</thead>" //
                 + "</table></v-grid>";
         Grid grid = new Grid();
@@ -76,7 +77,7 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
     public void testNoHeaderRows() {
         String design = "<v-grid><table>"//
                 + "<colgroup>"
-                + "   <col sortable='' property-id='Column1'>"
+                + "   <col sortable=true property-id='Column1'>"
                 + "</colgroup>" //
                 + "<thead />" //
                 + "</table></v-grid>";
@@ -93,13 +94,13 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
     public void testMultipleHeadersWithColSpans() {
         String design = "<v-grid><table>"//
                 + "<colgroup>"
-                + "   <col sortable='' property-id='Column1'>"
-                + "   <col sortable='' property-id='Column2'>"
-                + "   <col sortable='' property-id='Column3'>"
+                + "   <col sortable=true property-id='Column1'>"
+                + "   <col sortable=true property-id='Column2'>"
+                + "   <col sortable=true property-id='Column3'>"
                 + "</colgroup>" //
                 + "<thead>" //
                 + "   <tr><th colspan=3>Baz</tr>"
-                + "   <tr default=''><th>Column1<th>Column2<th>Column3</tr>" //
+                + "   <tr default='true'><th>Column1<th>Column2<th>Column3</tr>" //
                 + "   <tr><th>Foo<th colspan=2>Bar</tr>" //
                 + "</thead>" //
                 + "</table></v-grid>";
@@ -127,9 +128,9 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
     public void testSingleDefaultFooter() {
         String design = "<v-grid><table>"//
                 + "<colgroup>"
-                + "   <col sortable='' property-id='Column1'>"
-                + "   <col sortable='' property-id='Column2'>"
-                + "   <col sortable='' property-id='Column3'>"
+                + "   <col sortable=true property-id='Column1'>"
+                + "   <col sortable=true property-id='Column2'>"
+                + "   <col sortable=true property-id='Column3'>"
                 + "</colgroup>" //
                 + "<thead />" // No headers read or written
                 + "<tfoot>" //
@@ -156,9 +157,10 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
     public void testSingleDefaultHTMLFooter() {
         String design = "<v-grid><table>"//
                 + "<colgroup>"
-                + "   <col sortable='' property-id='Column1'>"
-                + "   <col sortable='' property-id='Column2'>"
-                + "   <col sortable='' property-id='Column3'>" + "</colgroup>" //
+                + "   <col sortable=true property-id='Column1'>"
+                + "   <col sortable=true property-id='Column2'>"
+                + "   <col sortable=true property-id='Column3'>"
+                + "</colgroup>" //
                 + "<thead />" // No headers read or written
                 + "<tfoot>" //
                 + "   <tr><td>Column1<td>Column2<td>Column3</tr>" //
@@ -184,9 +186,9 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
     public void testMultipleFootersWithColSpans() {
         String design = "<v-grid><table>"//
                 + "<colgroup>"
-                + "   <col sortable='' property-id='Column1'>"
-                + "   <col sortable='' property-id='Column2'>"
-                + "   <col sortable='' property-id='Column3'>"
+                + "   <col sortable=true property-id='Column1'>"
+                + "   <col sortable=true property-id='Column2'>"
+                + "   <col sortable=true property-id='Column3'>"
                 + "</colgroup>" //
                 + "<thead />" // No headers read or written.
                 + "<tfoot>" //
@@ -221,10 +223,10 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
     public void testComponentInGridHeader() {
         String design = "<v-grid><table>"//
                 + "<colgroup>"
-                + "   <col sortable='' property-id='Column1'>"
+                + "   <col sortable=true property-id='Column1'>"
                 + "</colgroup>" //
                 + "<thead>" //
-                + "<tr default=''><th><v-label><b>Foo</b></v-label></tr>"
+                + "<tr default=true><th><v-label><b>Foo</b></v-label></tr>"
                 + "</thead>"//
                 + "</table></v-grid>";
 
@@ -243,7 +245,7 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
     public void testComponentInGridFooter() {
         String design = "<v-grid><table>"//
                 + "<colgroup>"
-                + "   <col sortable='' property-id='Column1'>"
+                + "   <col sortable=true property-id='Column1'>"
                 + "</colgroup>" //
                 + "<thead />" // No headers read or written
                 + "<tfoot>" //

diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java
index d7feb4aa70267a60634bb4f504b6dcb5bc3b5901..fefd49a5877c0944357e6cae8429c0c0a7618645 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java
@@ -25,7 +25,7 @@ public class GridInlineDataDeclarativeTest extends GridDeclarativeTestBase {
     public void testSimpleInlineData() {
         String design = "<v-grid><table>"//
                 + "<colgroup>"
-                + "   <col sortable='' property-id='Col1' />"
+                + "   <col sortable=true property-id='Col1' />"
                 + "</colgroup>" //
                 + "<thead />" // No headers read or written
                 + "<tbody>" //
@@ -51,9 +51,9 @@ public class GridInlineDataDeclarativeTest extends GridDeclarativeTestBase {
     public void testMultipleColumnsInlineData() {
         String design = "<v-grid><table>"//
                 + "<colgroup>"
-                + "   <col sortable='' property-id='Col1' />"
-                + "   <col sortable='' property-id='Col2' />"
-                + "   <col sortable='' property-id='Col3' />" //
+                + "   <col sortable=true property-id='Col1' />"
+                + "   <col sortable=true property-id='Col2' />"
+                + "   <col sortable=true property-id='Col3' />" //
                 + "</colgroup>" //
                 + "<thead />" // No headers read or written
                 + "<tbody>" //
@@ -79,9 +79,9 @@ public class GridInlineDataDeclarativeTest extends GridDeclarativeTestBase {
     public void testMultipleColumnsInlineDataReordered() {
         String design = "<v-grid><table>"//
                 + "<colgroup>"
-                + "   <col sortable='' property-id='Col2' />"
-                + "   <col sortable='' property-id='Col3' />"
-                + "   <col sortable='' property-id='Col1' />" //
+                + "   <col sortable=true property-id='Col2' />"
+                + "   <col sortable=true property-id='Col3' />"
+                + "   <col sortable=true property-id='Col1' />" //
                 + "</colgroup>" //
                 + "<thead />" // No headers read or written
                 + "<tbody>" //

diff --git a/server/tests/src/com/vaadin/tests/server/component/popupview/PopupViewDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/popupview/PopupViewDeclarativeTest.java
index 1b50a517ae69ecca40467f1384114862ac7628ea..8bad68f5b94b4ded8b88111225fcc9244514af6e 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/popupview/PopupViewDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/popupview/PopupViewDeclarativeTest.java
@@ -48,7 +48,7 @@ public class PopupViewDeclarativeTest extends DeclarativeTestBase<PopupView> {
         component.setHideOnMouseOut(true);
         component.setPopupVisible(true);
         // hide-on-mouse-out is true by default. not seen in design
-        String design = "<v-popup-view popup-visible=''>" //
+        String design = "<v-popup-view popup-visible='true'>" //
                 + "Click <u>here</u> to open"
                 + "<popup-content>"
                 + new DesignContext().createElement(verticalLayout)

diff --git a/server/tests/src/com/vaadin/tests/server/component/progressbar/ProgressBarDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/progressbar/ProgressBarDeclarativeTest.java
index bed19644ff85e68bfc806ed506aa7f5c6ef3c42d..c98883a4a7e743e05545018183fb34d4eedc2701 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/progressbar/ProgressBarDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/progressbar/ProgressBarDeclarativeTest.java
@@ -29,7 +29,7 @@ public class ProgressBarDeclarativeTest extends
         DeclarativeTestBase<ProgressBar> {
 
     public String getBasicDesign() {
-        return "<v-progress-bar value=0.5 indeterminate=''>";
+        return "<v-progress-bar value=0.5 indeterminate='true'>";
 
     }
 

diff --git a/server/tests/src/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java
index 0d614b7b9afcd1857fc76364ad6c1ffa4ab813c7..9d61656801cf7bb7b1b1951484aab3a870d948f5 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java
@@ -24,7 +24,7 @@ public class RichTextAreaDeclarativeTest extends
         DeclarativeTestBase<RichTextArea> {
 
     private String getBasicDesign() {
-        return "<v-rich-text-area null-representation='' null-setting-allowed=''>\n"
+        return "<v-rich-text-area null-representation='' null-setting-allowed='true'>\n"
                 + "\n      <b>Header</b> <br/>Some text\n      "
                 + "</v-rich-text-area>";
     }

diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TableDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/table/TableDeclarativeTest.java
index 3de5ae052419c9e1e7b2182b3115f454ddf2acbb..c395d8501cbaca207d961dda6d10d0da4ad49026 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/table/TableDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TableDeclarativeTest.java
@@ -38,10 +38,10 @@ public class TableDeclarativeTest extends TableDeclarativeTestBase {
 
         String design = "<"
                 + getTag()
-                + " page-length=30 cache-rate=3 selectable='' editable='' "
+                + " page-length=30 cache-rate=3 selectable=true editable=true "
                 + "sortable=false sort-ascending=false sort-container-property-id=foo "
                 + "drag-mode=row multi-select-mode=simple column-header-mode=id row-header-mode=id "
-                + "column-reordering-allowed='' column-collapsing-allowed='' />";
+                + "column-reordering-allowed=true column-collapsing-allowed=true />";
 
         Table table = getTable();
         table.setPageLength(30);
@@ -69,12 +69,12 @@ public class TableDeclarativeTest extends TableDeclarativeTestBase {
     public void testColumns() {
         String design = "<"
                 + getTag()
-                + " column-collapsing-allowed=''>" //
+                + " column-collapsing-allowed=true>" //
                 + "  <table>" //
                 + "    <colgroup>"
                 + "      <col property-id='foo' width=300>"
                 + "      <col property-id='bar' center expand=1 collapsible=false>"
-                + "      <col property-id='baz' right expand=2 collapsed=''>"
+                + "      <col property-id='baz' right expand=2 collapsed=true>"
                 + "    </colgroup>" //
                 + "  </table>";
 

diff --git a/server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetDeclarativeTest.java
index c218f93a023253358a8f509a708fc1ae99b58149..a92101f55038ceedd0aa824d4a63752143486c0e 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetDeclarativeTest.java
@@ -36,7 +36,7 @@ public class TabSheetDeclarativeTest extends DeclarativeTestBase<TabSheet> {
     @Test
     public void testFeatures() {
         String design = "<v-tab-sheet tabindex=5><tab caption=test-caption "
-                + "visible=false closable='' enabled=false icon=http://www.vaadin.com/test.png"
+                + "visible=false closable=true enabled=false icon=http://www.vaadin.com/test.png"
                 + " icon-alt=OK description=test-desc style-name=test-style "
                 + "id=test-id><v-text-field/></tab></v-tab-sheet>";
         TabSheet ts = new TabSheet();
@@ -59,7 +59,7 @@ public class TabSheetDeclarativeTest extends DeclarativeTestBase<TabSheet> {
 
     @Test
     public void testSelected() {
-        String design = "<v-tab-sheet><tab selected=''><v-text-field/></tab></v-tab-sheet>";
+        String design = "<v-tab-sheet><tab selected=true><v-text-field/></tab></v-tab-sheet>";
         TabSheet ts = new TabSheet();
         TextField tf = new TextField();
         ts.addTab(tf);
@@ -71,7 +71,7 @@ public class TabSheetDeclarativeTest extends DeclarativeTestBase<TabSheet> {
     @Test
     public void tabsNotShown() {
         String design = "<v-tab-sheet tabs-visible=\"false\">\n"
-                + "  <tab caption=\"My Tab\" selected=\"\">\n"
+                + "  <tab caption=\"My Tab\" selected=\"true\">\n"
                 + "    <v-label>My Content</v-label>\n" + "  </tab>\n"
                 + "</v-tab-sheet>\n";
         TabSheet ts = new TabSheet();
@@ -84,4 +84,4 @@ public class TabSheetDeclarativeTest extends DeclarativeTestBase<TabSheet> {
         testWrite(design, ts);
 
     }
-}
+}
\ No newline at end of file

diff --git a/server/tests/src/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.java
index a30ca2a3efb7bd914f82b5cafb7e41b004d06e8f..5f487aa02138e15eb6b6f931bd9a6bc633d90528 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.java
@@ -33,7 +33,7 @@ public class TreeTableDeclarativeTest extends TableDeclarativeTest {
 
     @Test
     public void testAttributes() {
-        String design = "<v-tree-table animations-enabled=''>";
+        String design = "<v-tree-table animations-enabled=true>";
         TreeTable table = getTable();
         table.setAnimationsEnabled(true);
 

diff --git a/server/tests/src/com/vaadin/tests/server/component/window/WindowDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/window/WindowDeclarativeTest.java
index 1d233af494647dd92fcfec11f5779f438aa56d61..1ab001144227afbefd6a33bf8316bdfa2f9163e6 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/window/WindowDeclarativeTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/window/WindowDeclarativeTest.java
@@ -50,10 +50,10 @@ public class WindowDeclarativeTest extends DeclarativeTestBase<Window> {
     public void testFeatures() {
 
         String design = "<v-window position='100,100' window-mode='maximized' "
-                + "center modal='' resizable=false resize-lazy='' closable=false draggable=false "
+                + "center modal=true resizable=false resize-lazy=true closable=false draggable=false "
                 + "close-shortcut='ctrl-alt-escape' "
                 + "assistive-prefix='Hello' assistive-postfix='World' assistive-role='alertdialog' "
-                + "tab-stop-enabled='' "
+                + "tab-stop-enabled=true "
                 + "tab-stop-top-assistive-text='Do not move above the window' "
                 + "tab-stop-bottom-assistive-text='End of window'>"
                 + "</v-window>";