From e1491b1f08f6bd6e61f28f074a494f00c17edd43 Mon Sep 17 00:00:00 2001 From: John McGuinness Date: Fri, 19 Jun 2020 19:39:27 +1000 Subject: [PATCH 1/2] Replace usage of int Margins with Size margins --- .../github/bordertech/wcomponents/WCollapsible_Test.java | 2 +- .../bordertech/wcomponents/WDefinitionList_Test.java | 2 +- .../github/bordertech/wcomponents/WFieldLayout_Test.java | 2 +- .../com/github/bordertech/wcomponents/WFieldSet_Test.java | 2 +- .../com/github/bordertech/wcomponents/WFigure_Test.java | 2 +- .../com/github/bordertech/wcomponents/WHeading_Test.java | 2 +- .../java/com/github/bordertech/wcomponents/WMenu_Test.java | 2 +- .../com/github/bordertech/wcomponents/WSection_Test.java | 2 +- .../com/github/bordertech/wcomponents/WTabSet_Test.java | 2 +- .../com/github/bordertech/wcomponents/WTable_Test.java | 2 +- .../java/com/github/bordertech/wcomponents/WTree_Test.java | 2 +- .../render/webxml/WCollapsibleRenderer_Test.java | 2 +- .../render/webxml/WDefinitionListRenderer_Test.java | 2 +- .../render/webxml/WFieldLayoutRenderer_Test.java | 2 +- .../wcomponents/render/webxml/WFieldSetRenderer_Test.java | 2 +- .../wcomponents/render/webxml/WFigureRenderer_Test.java | 2 +- .../wcomponents/render/webxml/WHeadingRenderer_Test.java | 2 +- .../wcomponents/render/webxml/WListRenderer_Test.java | 2 +- .../wcomponents/render/webxml/WMenuRenderer_Test.java | 2 +- .../wcomponents/render/webxml/WPanelRenderer_Test.java | 2 +- .../wcomponents/render/webxml/WRowRenderer_Test.java | 3 +-- .../wcomponents/render/webxml/WSectionRenderer_Test.java | 2 +- .../wcomponents/render/webxml/WTabSetRenderer_Test.java | 2 +- .../wcomponents/render/webxml/WTableRenderer_Test.java | 2 +- .../bordertech/wcomponents/examples/AccordionExample.java | 3 ++- .../wcomponents/examples/LinkOptionsExample.java | 3 ++- .../bordertech/wcomponents/examples/WDialogExample.java | 5 +++-- .../examples/subordinate/SubordinateControlExample.java | 3 ++- .../subordinate/SubordinateControlGroupExample.java | 3 ++- .../subordinate/SubordinateControlMandatoryExample.java | 3 ++- .../SubordinateControlSimpleDisableExample.java | 3 ++- .../wcomponents/examples/theme/WCancelButtonExample.java | 2 +- .../examples/theme/WCollapsibleGroupExample.java | 3 ++- .../examples/theme/WPartialDateFieldExample.java | 2 +- .../wcomponents/examples/theme/WRadioButtonExample.java | 2 +- .../bordertech/wcomponents/examples/theme/WTabExample.java | 7 ++++--- .../wcomponents/examples/theme/WTabSetExample.java | 3 ++- .../examples/validation/ValidationContainer.java | 3 ++- .../validation/basic/BasicDiagnosticComponentExample.java | 3 ++- 39 files changed, 54 insertions(+), 43 deletions(-) diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WCollapsible_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WCollapsible_Test.java index 7f9ea4ee2..701a60590 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WCollapsible_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WCollapsible_Test.java @@ -109,7 +109,7 @@ public void testMarginAccessors() { WCollapsible collapsible = new WCollapsible(new WText(""), "", WCollapsible.CollapsibleMode.CLIENT); assertAccessorsCorrect(collapsible, WCollapsible::getMargin, WCollapsible::setMargin, - null, new Margin(1), new Margin(2)); + null, new Margin(Size.SMALL), new Margin(Size.MEDIUM)); } @Test diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WDefinitionList_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WDefinitionList_Test.java index 853b6bfb9..d35328a5f 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WDefinitionList_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WDefinitionList_Test.java @@ -31,7 +31,7 @@ public void testTypeAccessors() { @Test public void testMarginAccessors() { assertAccessorsCorrect(new WDefinitionList(), WDefinitionList::getMargin, WDefinitionList::setMargin, - null, new Margin(1), new Margin(2)); + null, new Margin(Size.SMALL), new Margin(Size.MEDIUM)); } @Test diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WFieldLayout_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WFieldLayout_Test.java index 6d8118308..9ec32f776 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WFieldLayout_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WFieldLayout_Test.java @@ -65,7 +65,7 @@ public void testTitleAccessors() { @Test public void testMarginAccessors() { assertAccessorsCorrect(new WFieldLayout(), WFieldLayout::getMargin, WFieldLayout::setMargin, - null, new Margin(1), new Margin(2)); + null, new Margin(Size.SMALL), new Margin(Size.MEDIUM)); } @Test diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WFieldSet_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WFieldSet_Test.java index 5e12cf3b9..63e044d63 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WFieldSet_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WFieldSet_Test.java @@ -68,7 +68,7 @@ public void testMandatoryWithMessage() { @Test public void testMarginAccessors() { assertAccessorsCorrect(new WFieldSet(""), WFieldSet::getMargin, WFieldSet::setMargin, - null, new Margin(1), new Margin(2)); + null, new Margin(Size.SMALL), new Margin(Size.MEDIUM)); } @Test diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WFigure_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WFigure_Test.java index 1b609a02d..7679f74d3 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WFigure_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WFigure_Test.java @@ -49,6 +49,6 @@ public void testModeAccessors() { @Test public void testMarginAccessors() { assertAccessorsCorrect(new WFigure(new WText(), ""), WFigure::getMargin, WFigure::setMargin, - null, new Margin(1), new Margin(2)); + null, new Margin(Size.SMALL), new Margin(Size.MEDIUM)); } } diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WHeading_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WHeading_Test.java index 136fba1d0..e1389aba8 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WHeading_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WHeading_Test.java @@ -60,7 +60,7 @@ public void testConstructorInvalidType4() { @Test public void testMarginAccessors() { assertAccessorsCorrect(new WHeading(HeadingLevel.H1, "test"), WHeading::getMargin, WHeading::setMargin, - null, new Margin(1), new Margin(2)); + null, new Margin(Size.SMALL), new Margin(Size.MEDIUM)); } @Test diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WMenu_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WMenu_Test.java index 403b58a08..dc833c7be 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WMenu_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WMenu_Test.java @@ -39,7 +39,7 @@ public void testRowsAccessors() { @Test public void testMarginAccessors() { assertAccessorsCorrect(new WMenu(), WMenu::getMargin, WMenu::setMargin, - null, new Margin(1), new Margin(2)); + null, new Margin(Size.SMALL), new Margin(Size.MEDIUM)); } @Test diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WSection_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WSection_Test.java index a34439f8a..b8d4dc7ca 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WSection_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WSection_Test.java @@ -49,6 +49,6 @@ public void testModeAccessors() { @Test public void testMarginAccessors() { assertAccessorsCorrect(new WSection(""), WSection::getMargin, WSection::setMargin, - null, new Margin(1), new Margin(2)); + null, new Margin(Size.SMALL), new Margin(Size.MEDIUM)); } } diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WTabSet_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WTabSet_Test.java index a9d63e9ff..44d48cba0 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WTabSet_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WTabSet_Test.java @@ -721,7 +721,7 @@ public void testSetShowHeadOnly() { @Test public void testMarginAccessors() { assertAccessorsCorrect(new WTabSet(), WTabSet::getMargin, WTabSet::setMargin, - null, new Margin(1), new Margin(2)); + null, new Margin(Size.SMALL), new Margin(Size.MEDIUM)); } @Test diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WTable_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WTable_Test.java index 8fc98f464..1edd159f1 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WTable_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WTable_Test.java @@ -73,7 +73,7 @@ public void testRenderFootersAccessors() { @Test public void testMarginAccessors() { assertAccessorsCorrect(new WTable(), WTable::getMargin, WTable::setMargin, - null, new Margin(1), new Margin(2)); + null, new Margin(Size.SMALL), new Margin(Size.MEDIUM)); } @Test diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WTree_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WTree_Test.java index 8349cea65..627d724d9 100644 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WTree_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/WTree_Test.java @@ -45,7 +45,7 @@ public void testTypeNull() { @Test public void testMarginAccessors() { assertAccessorsCorrect(new WTree(), WTree::getMargin, WTree::setMargin, - null, new Margin(1), new Margin(2)); + null, new Margin(Size.SMALL), new Margin(Size.MEDIUM)); } @Test diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WCollapsibleRenderer_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WCollapsibleRenderer_Test.java index 95894470f..64bab48b3 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WCollapsibleRenderer_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WCollapsibleRenderer_Test.java @@ -88,7 +88,7 @@ public void testRenderedWithMargins() throws IOException, SAXException, XpathExc COLLAPSIBLE_HEADING, WCollapsible.CollapsibleMode.EAGER); assertXpathNotExists("//ui:collapsible/ui:margin", collapsible); - Margin margin = new Margin(0); + Margin margin = new Margin(null); collapsible.setMargin(margin); assertXpathNotExists("//ui:collapsible/ui:margin", collapsible); diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WDefinitionListRenderer_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WDefinitionListRenderer_Test.java index 4a743d2bc..17c322ca0 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WDefinitionListRenderer_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WDefinitionListRenderer_Test.java @@ -101,7 +101,7 @@ public void testRenderedWithMargins() throws IOException, SAXException, XpathExc WDefinitionList section = new WDefinitionList(); assertXpathNotExists("//ui:definitionlist/ui:margin", section); - Margin margin = new Margin(0); + Margin margin = new Margin(null); section.setMargin(margin); assertXpathNotExists("//ui:definitionlist/ui:margin", section); diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WFieldLayoutRenderer_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WFieldLayoutRenderer_Test.java index 63457b5d2..72878ad27 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WFieldLayoutRenderer_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WFieldLayoutRenderer_Test.java @@ -110,7 +110,7 @@ public void testRenderedWithMargins() throws IOException, SAXException, XpathExc WFieldLayout layout = new WFieldLayout(); assertXpathNotExists("//ui:fieldlayout/ui:margin", layout); - Margin margin = new Margin(0); + Margin margin = new Margin(null); layout.setMargin(margin); assertXpathNotExists("//ui:fieldlayout/ui:margin", layout); diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WFieldSetRenderer_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WFieldSetRenderer_Test.java index ab968fbac..3adeb8603 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WFieldSetRenderer_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WFieldSetRenderer_Test.java @@ -63,7 +63,7 @@ public void testRenderedWithMargins() throws IOException, SAXException, XpathExc WFieldSet fieldSet = new WFieldSet(""); assertXpathNotExists("//ui:fieldset/ui:margin", fieldSet); - Margin margin = new Margin(0); + Margin margin = new Margin(null); fieldSet.setMargin(margin); assertXpathNotExists("//ui:fieldset/ui:margin", fieldSet); diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WFigureRenderer_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WFigureRenderer_Test.java index 5c412d7c3..2967e25f9 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WFigureRenderer_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WFigureRenderer_Test.java @@ -109,7 +109,7 @@ public void testRenderedWithMargins() throws IOException, SAXException, XpathExc WFigure figure = new WFigure(new WText(FIGURE_CONTENT), FIGURE_HEADING); assertXpathNotExists("//ui:figure/ui:margin", figure); - Margin margin = new Margin(0); + Margin margin = new Margin(null); figure.setMargin(margin); assertXpathNotExists("//ui:figure/ui:margin", figure); diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WHeadingRenderer_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WHeadingRenderer_Test.java index 46c3e890c..bb772355b 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WHeadingRenderer_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WHeadingRenderer_Test.java @@ -85,7 +85,7 @@ public void testRenderedWithMargins() throws IOException, SAXException, XpathExc WHeading heading = new WHeading(HeadingLevel.H1, "test"); assertXpathNotExists("//ui:heading/ui:margin", heading); - Margin margin = new Margin(0); + Margin margin = new Margin(null); heading.setMargin(margin); assertXpathNotExists("//ui:heading/ui:margin", heading); diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WListRenderer_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WListRenderer_Test.java index 723de882f..27559d7a1 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WListRenderer_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WListRenderer_Test.java @@ -124,7 +124,7 @@ public void testRenderedWithMargins() throws IOException, SAXException, XpathExc list.setRepeatedComponent(new WText()); assertXpathNotExists("//ui:panel/ui:margin", list); - Margin margin = new Margin(0); + Margin margin = new Margin(null); list.setMargin(margin); assertXpathNotExists("//ui:panel/ui:margin", list); diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WMenuRenderer_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WMenuRenderer_Test.java index a3c83972a..5aa33e72b 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WMenuRenderer_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WMenuRenderer_Test.java @@ -86,7 +86,7 @@ public void testRenderedWithMargins() throws IOException, SAXException, XpathExc assertXpathNotExists("//ui:menu/ui:margin", menu); - Margin margin = new Margin(0); + Margin margin = new Margin(null); menu.setMargin(margin); assertXpathNotExists("//ui:menu/ui:margin", menu); diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WPanelRenderer_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WPanelRenderer_Test.java index 317569fdc..635b71f4b 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WPanelRenderer_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WPanelRenderer_Test.java @@ -151,7 +151,7 @@ public void testRenderedWithMargins() throws IOException, SAXException, XpathExc WPanel panel = new WPanel(); assertXpathNotExists("//ui:panel/ui:margin", panel); - Margin margin = new Margin(0); + Margin margin = new Margin(null); panel.setMargin(margin); assertXpathNotExists("//ui:panel/ui:margin", panel); diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WRowRenderer_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WRowRenderer_Test.java index 2d524d3b6..e45f04705 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WRowRenderer_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WRowRenderer_Test.java @@ -4,7 +4,6 @@ import com.github.bordertech.wcomponents.Size; import com.github.bordertech.wcomponents.WColumn; import com.github.bordertech.wcomponents.WRow; -import com.github.bordertech.wcomponents.util.SpaceUtil; import java.io.IOException; import org.junit.Assert; import org.custommonkey.xmlunit.exceptions.XpathException; @@ -67,7 +66,7 @@ public void testRenderedWithMargins() throws IOException, SAXException, XpathExc assertXpathNotExists("//ui:row/ui:margin", row); - Margin margin = new Margin(0); + Margin margin = new Margin(null); row.setMargin(margin); assertXpathNotExists("//ui:row/ui:margin", row); diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WSectionRenderer_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WSectionRenderer_Test.java index 723b4ef43..c79b1aaf4 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WSectionRenderer_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WSectionRenderer_Test.java @@ -113,7 +113,7 @@ public void testRenderedWithMargins() throws IOException, SAXException, XpathExc WSection section = new WSection(""); assertXpathNotExists("//ui:section/ui:margin", section); - Margin margin = new Margin(0); + Margin margin = new Margin(null); section.setMargin(margin); assertXpathNotExists("//ui:section/ui:margin", section); diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WTabSetRenderer_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WTabSetRenderer_Test.java index 1140868bd..7eb52e55d 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WTabSetRenderer_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WTabSetRenderer_Test.java @@ -67,7 +67,7 @@ public void testRenderedWithMargins() throws IOException, SAXException, XpathExc assertXpathNotExists("//ui:tabset/ui:margin", tabSet); - Margin margin = new Margin(0); + Margin margin = new Margin(null); tabSet.setMargin(margin); assertXpathNotExists("//ui:tabset/ui:margin", tabSet); diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WTableRenderer_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WTableRenderer_Test.java index 79b57fde9..a337308ff 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WTableRenderer_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WTableRenderer_Test.java @@ -767,7 +767,7 @@ public void testRenderedWithMargins() throws IOException, SAXException, XpathExc table.addColumn(new WTableColumn(COL1_HEADING_TEST, WTextField.class)); assertXpathNotExists("//ui:table/ui:margin", table); - Margin margin = new Margin(0); + Margin margin = new Margin(null); table.setMargin(margin); assertXpathNotExists("//ui:table/ui:margin", table); diff --git a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/AccordionExample.java b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/AccordionExample.java index 4f461a22f..58bbdb5db 100644 --- a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/AccordionExample.java +++ b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/AccordionExample.java @@ -1,6 +1,7 @@ package com.github.bordertech.wcomponents.examples; import com.github.bordertech.wcomponents.HeadingLevel; +import com.github.bordertech.wcomponents.Size; import com.github.bordertech.wcomponents.WButton; import com.github.bordertech.wcomponents.WCheckBox; import com.github.bordertech.wcomponents.WContainer; @@ -136,7 +137,7 @@ private void init() { addTab(sampleTabContent("Content 4"), "Tab 4 (lazy)", WTabSet.TAB_MODE_LAZY); addTab(sampleTabContent("Content 5"), "Tab 5 (dynamic)", WTabSet.TAB_MODE_DYNAMIC); addTab(sampleTabContent("Content 6"), "Tab 6 (eager)", WTabSet.TAB_MODE_EAGER); - setMargin(new com.github.bordertech.wcomponents.Margin(0, 0, 12, 0)); + setMargin(new com.github.bordertech.wcomponents.Margin(Size.ZERO, Size.ZERO, Size.LARGE, Size.ZERO)); } diff --git a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/LinkOptionsExample.java b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/LinkOptionsExample.java index 8f5449aca..f72556a38 100755 --- a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/LinkOptionsExample.java +++ b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/LinkOptionsExample.java @@ -2,6 +2,7 @@ import com.github.bordertech.wcomponents.ActionEvent; import com.github.bordertech.wcomponents.Request; +import com.github.bordertech.wcomponents.Size; import com.github.bordertech.wcomponents.WButton; import com.github.bordertech.wcomponents.WCheckBox; import com.github.bordertech.wcomponents.WContainer; @@ -129,7 +130,7 @@ private WFieldSet getButtonControls(final WValidationErrors errors) { layout.addField("Open in a new window", cbOpenNew); layout.addField("setImage ('/image/attachment.png')", cbSetImage); layout.addField("Image Position", ddImagePosition); - layout.setMargin(new com.github.bordertech.wcomponents.Margin(0, 0, 6, 0)); + layout.setMargin(new com.github.bordertech.wcomponents.Margin(Size.ZERO, Size.ZERO, Size.MEDIUM, Size.ZERO)); // Apply Button WButton apply = new WButton("Apply"); diff --git a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/WDialogExample.java b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/WDialogExample.java index 845275f7e..e7c8cdf79 100755 --- a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/WDialogExample.java +++ b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/WDialogExample.java @@ -5,6 +5,7 @@ import com.github.bordertech.wcomponents.HeadingLevel; import com.github.bordertech.wcomponents.MessageContainer; import com.github.bordertech.wcomponents.Request; +import com.github.bordertech.wcomponents.Size; import com.github.bordertech.wcomponents.WAjaxControl; import com.github.bordertech.wcomponents.WButton; import com.github.bordertech.wcomponents.WCancelButton; @@ -427,7 +428,7 @@ private SelectPersonPanel() { final WPanel buttonPanel = new WPanel(WPanel.Type.FEATURE); buttonPanel.setLayout(new BorderLayout()); - buttonPanel.setMargin(new com.github.bordertech.wcomponents.Margin(12, 0, 0, 0)); + buttonPanel.setMargin(new com.github.bordertech.wcomponents.Margin(Size.LARGE, Size.ZERO, Size.ZERO, Size.ZERO)); add(buttonPanel); buttonPanel.add(cancelButton, BorderLayout.WEST); buttonPanel.add(selectButton, BorderLayout.EAST); @@ -557,7 +558,7 @@ private static final class SearchFieldSet extends WFieldSet { */ private SearchFieldSet() { super("Search for person"); - setMargin(new com.github.bordertech.wcomponents.Margin(0, 0, 12, 0)); + setMargin(new com.github.bordertech.wcomponents.Margin(Size.ZERO, Size.ZERO, Size.LARGE, Size.ZERO)); firstName.setMandatory(true); WFieldLayout fieldLayout = new WFieldLayout(); add(fieldLayout); diff --git a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/subordinate/SubordinateControlExample.java b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/subordinate/SubordinateControlExample.java index 002e7bd9b..e2453a034 100755 --- a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/subordinate/SubordinateControlExample.java +++ b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/subordinate/SubordinateControlExample.java @@ -1,6 +1,7 @@ package com.github.bordertech.wcomponents.examples.subordinate; import com.github.bordertech.wcomponents.Input; +import com.github.bordertech.wcomponents.Size; import com.github.bordertech.wcomponents.SubordinateTarget; import com.github.bordertech.wcomponents.WCheckBox; import com.github.bordertech.wcomponents.WComponent; @@ -109,7 +110,7 @@ public CardSelector() { WFieldLayout layout = new WFieldLayout(); add(layout); layout.setLabelWidth(25); - layout.setMargin(new com.github.bordertech.wcomponents.Margin(0, 0, 12, 0)); + layout.setMargin(new com.github.bordertech.wcomponents.Margin(Size.ZERO, Size.ZERO, Size.LARGE, Size.ZERO)); // // diff --git a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/subordinate/SubordinateControlGroupExample.java b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/subordinate/SubordinateControlGroupExample.java index 5b470a37b..9dd55e4ab 100755 --- a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/subordinate/SubordinateControlGroupExample.java +++ b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/subordinate/SubordinateControlGroupExample.java @@ -1,5 +1,6 @@ package com.github.bordertech.wcomponents.examples.subordinate; +import com.github.bordertech.wcomponents.Size; import com.github.bordertech.wcomponents.SubordinateTarget; import com.github.bordertech.wcomponents.WComponentGroup; import com.github.bordertech.wcomponents.WDropdown; @@ -35,7 +36,7 @@ public SubordinateControlGroupExample() { WFieldLayout layout = new WFieldLayout(); add(layout); layout.setLabelWidth(25); - layout.setMargin(new com.github.bordertech.wcomponents.Margin(0, 0, 12, 0)); + layout.setMargin(new com.github.bordertech.wcomponents.Margin(Size.ZERO, Size.ZERO, Size.LARGE, Size.ZERO)); WDropdown select = new WDropdown(); select.setOptions(new String[]{SHOW_FIRST, SHOW_ALL, HIDE_ALL, HIDE_LAYOUT}); diff --git a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/subordinate/SubordinateControlMandatoryExample.java b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/subordinate/SubordinateControlMandatoryExample.java index ebbc79931..f3aca9d6a 100755 --- a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/subordinate/SubordinateControlMandatoryExample.java +++ b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/subordinate/SubordinateControlMandatoryExample.java @@ -1,5 +1,6 @@ package com.github.bordertech.wcomponents.examples.subordinate; +import com.github.bordertech.wcomponents.Size; import com.github.bordertech.wcomponents.WCheckBox; import com.github.bordertech.wcomponents.WComponent; import com.github.bordertech.wcomponents.WContainer; @@ -42,7 +43,7 @@ private static WComponent build() { WFieldLayout layout = new WFieldLayout(); layout.setLabelWidth(25); - layout.setMargin(new com.github.bordertech.wcomponents.Margin(0, 0, 12, 0)); + layout.setMargin(new com.github.bordertech.wcomponents.Margin(Size.ZERO, Size.ZERO, Size.LARGE, Size.ZERO)); WCheckBox checkBox = new WCheckBox(); layout.addField("Set Mandatory", checkBox); diff --git a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/subordinate/SubordinateControlSimpleDisableExample.java b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/subordinate/SubordinateControlSimpleDisableExample.java index c9ef67e7d..e2ba3b7db 100755 --- a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/subordinate/SubordinateControlSimpleDisableExample.java +++ b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/subordinate/SubordinateControlSimpleDisableExample.java @@ -1,5 +1,6 @@ package com.github.bordertech.wcomponents.examples.subordinate; +import com.github.bordertech.wcomponents.Size; import com.github.bordertech.wcomponents.WButton; import com.github.bordertech.wcomponents.WCheckBox; import com.github.bordertech.wcomponents.WCheckBoxSelect; @@ -31,7 +32,7 @@ public class SubordinateControlSimpleDisableExample extends WPanel { public SubordinateControlSimpleDisableExample() { WFieldLayout layout = new WFieldLayout(); layout.setLabelWidth(25); - layout.setMargin(new com.github.bordertech.wcomponents.Margin(0, 0, 12, 0)); + layout.setMargin(new com.github.bordertech.wcomponents.Margin(Size.ZERO, Size.ZERO, Size.LARGE, Size.ZERO)); add(layout); // The toggle used to enable/disable the other fields. diff --git a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WCancelButtonExample.java b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WCancelButtonExample.java index bdce70694..9bd32dcde 100755 --- a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WCancelButtonExample.java +++ b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WCancelButtonExample.java @@ -83,7 +83,7 @@ public WCancelButtonExample() { WPanel buttonPanel = new WPanel(Type.FEATURE); buttonPanel.setLayout(new FlowLayout(Alignment.LEFT, Size.SMALL)); - buttonPanel.setMargin(new com.github.bordertech.wcomponents.Margin(12, 0, 0, 0)); + buttonPanel.setMargin(new com.github.bordertech.wcomponents.Margin(Size.LARGE, Size.ZERO, Size.ZERO, Size.ZERO)); buttonPanel.add(prevButton); buttonPanel.add(nextButton); buttonPanel.add(finishButton); diff --git a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WCollapsibleGroupExample.java b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WCollapsibleGroupExample.java index a2181f6d2..352e21488 100755 --- a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WCollapsibleGroupExample.java +++ b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WCollapsibleGroupExample.java @@ -1,6 +1,7 @@ package com.github.bordertech.wcomponents.examples.theme; import com.github.bordertech.wcomponents.CollapsibleGroup; +import com.github.bordertech.wcomponents.Size; import com.github.bordertech.wcomponents.WCollapsible; import com.github.bordertech.wcomponents.WCollapsibleToggle; import com.github.bordertech.wcomponents.WHorizontalRule; @@ -28,7 +29,7 @@ public WCollapsibleGroupExample() { WPanel panel = new WPanel(); panel.setLayout(new GridLayout(3, 2, 6, 12)); - panel.setMargin(new com.github.bordertech.wcomponents.Margin(0, 0, 12, 0)); + panel.setMargin(new com.github.bordertech.wcomponents.Margin(Size.ZERO, Size.ZERO, Size.LARGE, Size.ZERO)); add(panel); CollapsibleGroup group1 = new CollapsibleGroup(); diff --git a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WPartialDateFieldExample.java b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WPartialDateFieldExample.java index 063bb7add..c40f35b88 100755 --- a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WPartialDateFieldExample.java +++ b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WPartialDateFieldExample.java @@ -81,7 +81,7 @@ public WPartialDateFieldExample() { WPanel setDateButtonPanel = new WPanel(WPanel.Type.FEATURE); wrapper.add(setDateButtonPanel); setDateButtonPanel.setLayout(new FlowLayout(FlowLayout.LEFT, Size.MEDIUM)); - setDateButtonPanel.setMargin(new com.github.bordertech.wcomponents.Margin(6, 0, 0, 0)); + setDateButtonPanel.setMargin(new com.github.bordertech.wcomponents.Margin(Size.MEDIUM, Size.ZERO, Size.ZERO, Size.ZERO)); final WButton btnSetDMY = new WButton("Set the day month year"); setDateButtonPanel.add(btnSetDMY); diff --git a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WRadioButtonExample.java b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WRadioButtonExample.java index 3265c10d6..2fe3ab943 100755 --- a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WRadioButtonExample.java +++ b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WRadioButtonExample.java @@ -43,7 +43,7 @@ public WRadioButtonExample() { WFieldSet fset = new WFieldSet("What is your quest?"); add(fset); - fset.setMargin(new com.github.bordertech.wcomponents.Margin(0, 0, 12, 0)); + fset.setMargin(new com.github.bordertech.wcomponents.Margin(Size.ZERO, Size.ZERO, Size.LARGE, Size.ZERO)); WFieldLayout layout = new WFieldLayout(WFieldLayout.LAYOUT_STACKED); fset.add(layout); diff --git a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WTabExample.java b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WTabExample.java index 410414a12..c323bcd31 100755 --- a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WTabExample.java +++ b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WTabExample.java @@ -2,6 +2,7 @@ import com.github.bordertech.wcomponents.HeadingLevel; import com.github.bordertech.wcomponents.Request; +import com.github.bordertech.wcomponents.Size; import com.github.bordertech.wcomponents.WCheckBox; import com.github.bordertech.wcomponents.WDecoratedLabel; import com.github.bordertech.wcomponents.WFieldLayout; @@ -82,7 +83,7 @@ public WTabExample() { tabset1TabClient = tabset1.addTab(new ExplanatoryText( "This content was present when the page first rendered."), "Another Client", TabMode.CLIENT); - tabset1.setMargin(new com.github.bordertech.wcomponents.Margin(0, 0, 24, 0)); + tabset1.setMargin(new com.github.bordertech.wcomponents.Margin(Size.ZERO, Size.ZERO, Size.XL, Size.ZERO)); add(tabset1); add(new WHeading(HeadingLevel.H3, "One tab disabled.")); @@ -113,7 +114,7 @@ public WTabExample() { add(new WHeading(HeadingLevel.H3, "Tabs with access keys")); WTabSet tabset5 = new WTabSet(); add(tabset5); - tabset5.setMargin(new com.github.bordertech.wcomponents.Margin(0, 0, 24, 0)); + tabset5.setMargin(new com.github.bordertech.wcomponents.Margin(Size.ZERO, Size.ZERO, Size.XL, Size.ZERO)); tabset5.addTab(new ExplanatoryText("Some content should go into here."), "First tab", WTabSet.TAB_MODE_CLIENT, 'T'); @@ -238,7 +239,7 @@ private SampleTabSet(final int activeIdx) { * Setup tabs et. */ private void init() { - setMargin(new com.github.bordertech.wcomponents.Margin(0, 0, 24, 0)); + setMargin(new com.github.bordertech.wcomponents.Margin(Size.ZERO, Size.ZERO, Size.XL, Size.ZERO)); addTab(new ExplanatoryText("Some content should go into here."), "First tab", WTabSet.TAB_MODE_CLIENT); addTab(new ExplanatoryText(LONG_TEXT), "Second tab", WTabSet.TAB_MODE_CLIENT); diff --git a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WTabSetExample.java b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WTabSetExample.java index 0f460f8da..be19ffc08 100755 --- a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WTabSetExample.java +++ b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WTabSetExample.java @@ -1,6 +1,7 @@ package com.github.bordertech.wcomponents.examples.theme; import com.github.bordertech.wcomponents.HeadingLevel; +import com.github.bordertech.wcomponents.Size; import com.github.bordertech.wcomponents.WCheckBox; import com.github.bordertech.wcomponents.WContainer; import com.github.bordertech.wcomponents.WDecoratedLabel; @@ -258,7 +259,7 @@ private void init() { addTab(new DateText("Content 4"), "Tab 4 (lazy)", WTabSet.TAB_MODE_LAZY); addTab(new DateText("Content 5"), "Tab 5 (dynamic)", WTabSet.TAB_MODE_DYNAMIC); addTab(new DateText("Content 6"), "Tab 6 (eager)", WTabSet.TAB_MODE_EAGER); - setMargin(new com.github.bordertech.wcomponents.Margin(0, 0, 12, 0)); + setMargin(new com.github.bordertech.wcomponents.Margin(Size.ZERO, Size.ZERO, Size.LARGE, Size.ZERO)); } } diff --git a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/validation/ValidationContainer.java b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/validation/ValidationContainer.java index 25438a8db..e275d9b63 100755 --- a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/validation/ValidationContainer.java +++ b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/validation/ValidationContainer.java @@ -3,6 +3,7 @@ import com.github.bordertech.wcomponents.Action; import com.github.bordertech.wcomponents.ActionEvent; import com.github.bordertech.wcomponents.MessageContainer; +import com.github.bordertech.wcomponents.Size; import com.github.bordertech.wcomponents.WButton; import com.github.bordertech.wcomponents.WCardManager; import com.github.bordertech.wcomponents.WComponent; @@ -89,7 +90,7 @@ public void execute(final ActionEvent event) { WPanel buttonPanel = new WPanel(WPanel.Type.FEATURE); mainPanel.add(buttonPanel); - buttonPanel.setMargin(new com.github.bordertech.wcomponents.Margin(12, 0, 0, 0)); + buttonPanel.setMargin(new com.github.bordertech.wcomponents.Margin(Size.LARGE, Size.ZERO, Size.ZERO, Size.ZERO)); buttonPanel.setLayout(new BorderLayout()); buttonPanel.add(validateBtn, BorderLayout.EAST); buttonPanel.add(resetBtn, BorderLayout.WEST); diff --git a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/validation/basic/BasicDiagnosticComponentExample.java b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/validation/basic/BasicDiagnosticComponentExample.java index c765fb3a7..dc9a4e00a 100755 --- a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/validation/basic/BasicDiagnosticComponentExample.java +++ b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/validation/basic/BasicDiagnosticComponentExample.java @@ -1,5 +1,6 @@ package com.github.bordertech.wcomponents.examples.validation.basic; +import com.github.bordertech.wcomponents.Size; import com.github.bordertech.wcomponents.UIContextHolder; import com.github.bordertech.wcomponents.WComponent; import com.github.bordertech.wcomponents.WContainer; @@ -49,7 +50,7 @@ public static class WDiagnosticComponent extends WContainer { public WDiagnosticComponent() { WFieldLayout layout = new WFieldLayout(); layout.setLabelWidth(30); - layout.setMargin(new com.github.bordertech.wcomponents.Margin(0, 0, 12, 0)); + layout.setMargin(new com.github.bordertech.wcomponents.Margin(Size.ZERO, Size.ZERO, Size.LARGE, Size.ZERO)); //mandatory fields inputText1.setMandatory(true); layout.addField("Unique Input 1", inputText1).getLabel().setHint("required"); From fc0e639bc4e5045f9f4b53e00b818e8f48e0d7c2 Mon Sep 17 00:00:00 2001 From: John McGuinness Date: Wed, 24 Jun 2020 23:45:54 +1000 Subject: [PATCH 2/2] Made requested changes --- .../bordertech/wcomponents/Margin_Test.java | 68 +++++++++++++++++-- .../render/webxml/WPanelRenderer_Test.java | 19 +----- 2 files changed, 63 insertions(+), 24 deletions(-) diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/Margin_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/Margin_Test.java index cd896b9aa..cc21b20a6 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/Margin_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/Margin_Test.java @@ -17,6 +17,50 @@ public void testConstructor1() { // Create Margin with "all" Margin margin = new Margin(Size.SMALL); Assert.assertEquals("Incorrect all margin returned", Size.SMALL, margin.getMargin()); + Assert.assertEquals("Incorrect top margin returned", null, margin.getTop()); + Assert.assertEquals("Incorrect right margin returned", null, margin.getRight()); + Assert.assertEquals("Incorrect bottom margin returned", null, margin.getBottom()); + Assert.assertEquals("Incorrect left margin returned", null, margin.getLeft()); + + Assert.assertEquals("Incorrect all margin returned", -1, margin.getAll()); + Assert.assertEquals("Incorrect north margin returned", -1, margin.getNorth()); + Assert.assertEquals("Incorrect east margin returned", -1, margin.getEast()); + Assert.assertEquals("Incorrect south margin returned", -1, margin.getSouth()); + Assert.assertEquals("Incorrect west margin returned", -1, margin.getWest()); + } + + @Test + public void testConstructor2() { + // Create Margin for all sides + Margin margin = new Margin(Size.SMALL, Size.MEDIUM, Size.LARGE, Size.XL); + Assert.assertEquals("Incorrect all margin returned", null, margin.getMargin()); + Assert.assertEquals("Incorrect top margin returned", Size.SMALL, margin.getTop()); + Assert.assertEquals("Incorrect right margin returned", Size.MEDIUM, margin.getRight()); + Assert.assertEquals("Incorrect bottom margin returned", Size.LARGE, margin.getBottom()); + Assert.assertEquals("Incorrect left margin returned", Size.XL, margin.getLeft()); + + Assert.assertEquals("Incorrect all margin returned", -1, margin.getAll()); + Assert.assertEquals("Incorrect north margin returned", -1, margin.getNorth()); + Assert.assertEquals("Incorrect east margin returned", -1, margin.getEast()); + Assert.assertEquals("Incorrect south margin returned", -1, margin.getSouth()); + Assert.assertEquals("Incorrect west margin returned", -1, margin.getWest()); + } + + // Deprecated constructors + @Test + public void testConstructor3() { + // Create Margin with "all" + int intSize = 6; + Size size = SpaceUtil.intToSize(intSize); + Margin margin = new Margin(6); + Assert.assertEquals("Incorrect all margin returned", intSize, margin.getAll()); + Assert.assertEquals("Incorrect all margin returned", size, margin.getMargin()); + Assert.assertEquals("Incorrect north margin returned", -1, margin.getNorth()); + Assert.assertEquals("Incorrect east margin returned", -1, margin.getEast()); + Assert.assertEquals("Incorrect south margin returned", -1, margin.getSouth()); + Assert.assertEquals("Incorrect west margin returned", -1, margin.getWest()); + + Assert.assertEquals("Incorrect all margin returned", size, margin.getMargin()); Assert.assertEquals("Incorrect north margin returned", null, margin.getTop()); Assert.assertEquals("Incorrect east margin returned", null, margin.getRight()); Assert.assertEquals("Incorrect south margin returned", null, margin.getBottom()); @@ -24,14 +68,26 @@ public void testConstructor1() { } @Test - public void testConstructor2() { + public void testConstructor4() { // Create Margin for all sides - Margin margin = new Margin(Size.SMALL, Size.MEDIUM, Size.LARGE, Size.XL); + final int north = 1; + final int east = 5; + final int south = 9; + final int west = 17; + + Margin margin = new Margin(north, east, south, west); + + Assert.assertEquals("Incorrect north margin returned", -1, margin.getAll()); + Assert.assertEquals("Incorrect north margin returned", north, margin.getNorth()); + Assert.assertEquals("Incorrect east margin returned", east, margin.getEast()); + Assert.assertEquals("Incorrect south margin returned", south, margin.getSouth()); + Assert.assertEquals("Incorrect west margin returned", west, margin.getWest()); + Assert.assertEquals("Incorrect all margin returned", null, margin.getMargin()); - Assert.assertEquals("Incorrect north margin returned", Size.SMALL, margin.getTop()); - Assert.assertEquals("Incorrect east margin returned", Size.MEDIUM, margin.getRight()); - Assert.assertEquals("Incorrect south margin returned", Size.LARGE, margin.getBottom()); - Assert.assertEquals("Incorrect west margin returned", Size.XL, margin.getLeft()); + Assert.assertEquals("Incorrect north margin returned", SpaceUtil.intToSize(north), margin.getTop()); + Assert.assertEquals("Incorrect east margin returned", SpaceUtil.intToSize(east), margin.getRight()); + Assert.assertEquals("Incorrect south margin returned", SpaceUtil.intToSize(south), margin.getBottom()); + Assert.assertEquals("Incorrect west margin returned", SpaceUtil.intToSize(west), margin.getLeft()); } @Test diff --git a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WPanelRenderer_Test.java b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WPanelRenderer_Test.java index 635b71f4b..24945c7e0 100755 --- a/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WPanelRenderer_Test.java +++ b/wcomponents-core/src/test/java/com/github/bordertech/wcomponents/render/webxml/WPanelRenderer_Test.java @@ -164,26 +164,10 @@ public void testRenderedWithMargins() throws IOException, SAXException, XpathExc assertXpathEvaluatesTo("", "//ui:panel/ui:margin/@south", panel); assertXpathEvaluatesTo("", "//ui:panel/ui:margin/@west", panel); - margin = new Margin(0, 0, 0, 0); + margin = new Margin(null, null, null, null); panel.setMargin(margin); assertXpathNotExists("//ui:panel/ui:margin", panel); - margin = new Margin(1, 0, 0, 0); - panel.setMargin(margin); - assertXpathExists("//ui:panel/ui:margin", panel); - - margin = new Margin(0, 1, 0, 0); - panel.setMargin(margin); - assertXpathExists("//ui:panel/ui:margin", panel); - - margin = new Margin(0, 0, 1, 0); - panel.setMargin(margin); - assertXpathExists("//ui:panel/ui:margin", panel); - - margin = new Margin(0, 0, 0, 1); - panel.setMargin(margin); - assertXpathExists("//ui:panel/ui:margin", panel); - margin = new Margin(Size.SMALL, Size.MEDIUM, Size.LARGE, Size.XL); panel.setMargin(margin); assertSchemaMatch(panel); @@ -193,5 +177,4 @@ public void testRenderedWithMargins() throws IOException, SAXException, XpathExc assertXpathEvaluatesTo("lg", "//ui:panel/ui:margin/@south", panel); assertXpathEvaluatesTo("xl", "//ui:panel/ui:margin/@west", panel); } - }