diff options
author | Mika Murtojarvi <mika@vaadin.com> | 2015-08-19 10:50:35 +0300 |
---|---|---|
committer | Mika Murtojarvi <mika@vaadin.com> | 2015-08-19 10:51:06 +0300 |
commit | 78a9aa10777eb2ef594a573ad86f245c0eb602c6 (patch) | |
tree | 5bc80c7291409c252bc57d261a5d90e8cc65a0ee | |
parent | cdc07e55c12dc4ffbe509e15c4f4f165fb4a1670 (diff) | |
download | vaadin-framework-78a9aa10777eb2ef594a573ad86f245c0eb602c6.tar.gz vaadin-framework-78a9aa10777eb2ef594a573ad86f245c0eb602c6.zip |
Revert "Write true as attribute="" (#17519)"
This reverts commit cdc07e55c12dc4ffbe509e15c4f4f165fb4a1670.
Change-Id: Iad07a0292639d89c8f029c690005e7f1041eb79f
28 files changed, 104 insertions, 105 deletions
diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java index f499cb1fec..18c3509af7 100644 --- 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 73c45caed4..b1d2520631 100644 --- 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 d058ae1dcd..3bc1ebfbf9 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<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 1119301c55..83b3e577dc 100644 --- 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 acee3e2ca8..00af20ea8c 100644 --- 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 42715e52ae..9fcb64acca 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<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 71021a06e1..4f45168a32 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 = "<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 b4afde5923..55231e5494 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 = "<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 b294ffad72..b3867a7a3a 100644 --- 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 efcdc3e997..4d75e0b59f 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 = - "<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 11d97d191b..2d6db6d19a 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,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 b8e570bc89..a3594b7159 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 = "<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 ec2b5241f3..4390499c4e 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<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 5be70bd2db..fc0b3d9512 100644 --- 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 e0f0b7c3e9..6162e41494 100644 --- 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 33521d3af2..59b2efdc42 100644 --- 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 4087f1ad11..5058cf5a5f 100644 --- 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 aa9a499469..6cf9ef55ad 100644 --- 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 43f394eafc..8ffe749f6f 100644 --- 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 8e1d880c5e..b4e82950cb 100644 --- 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 d7feb4aa70..fefd49a587 100644 --- 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 1b50a517ae..8bad68f5b9 100644 --- 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 bed19644ff..c98883a4a7 100644 --- 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 0d614b7b9a..9d61656801 100644 --- 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 3de5ae0524..c395d8501c 100644 --- 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 c218f93a02..a92101f550 100644 --- 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 a30ca2a3ef..5f487aa021 100644 --- 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 1d233af494..1ab0011442 100644 --- 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>"; |