From 26039540f149464e97dbdf859c779772c8b9c2dc Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Wed, 3 Dec 2008 13:03:57 +0000 Subject: [PATCH] Misc test case fixes (invalid size definitions, invalid usage of AlignmentHandler/SpacingHandler). svn changeset:6082/svn branch:trunk --- .../toolkit/tests/tickets/Ticket1966.java | 12 +++--- .../toolkit/tests/tickets/Ticket1966_2.java | 6 +-- .../toolkit/tests/tickets/Ticket1966_3.java | 12 +++--- .../toolkit/tests/tickets/Ticket2021.java | 42 ++++++++++--------- .../toolkit/tests/tickets/Ticket2061.java | 2 +- .../toolkit/tests/tickets/Ticket2061b.java | 15 ++++++- .../toolkit/tests/tickets/Ticket2095.java | 4 +- .../toolkit/tests/tickets/Ticket2204.java | 1 + .../toolkit/tests/tickets/Ticket2232.java | 11 ++--- 9 files changed, 63 insertions(+), 42 deletions(-) diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1966.java b/src/com/itmill/toolkit/tests/tickets/Ticket1966.java index 1092c4bac8..496016f4ec 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1966.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1966.java @@ -54,7 +54,7 @@ public class Ticket1966 extends Application { Button b; b = new Button("Wide button"); - b.setWidth("500"); + b.setWidth("500px"); gl.addComponent(b); addButtons(gl); @@ -87,7 +87,7 @@ public class Ticket1966 extends Application { Button b; b = new Button("Wide button"); - b.setWidth("500"); + b.setWidth("500px"); ol.addComponent(b); addButtons(ol); @@ -107,19 +107,19 @@ public class Ticket1966 extends Application { } - private void addButtons(AlignmentHandler ol) { + private void addButtons(Layout ol) { ol.addComponent(getButton(ol, LEFT, TOP)); ol.addComponent(getButton(ol, CENTER, VCENTER)); ol.addComponent(getButton(ol, RIGHT, BOTTOM)); } - private Button getButton(AlignmentHandler l, int hAlign, int vAlign) { + private Button getButton(Layout l, int hAlign, int vAlign) { Button b = new Button("Narrow Button - " + names.get(new Integer(hAlign)) + " - " + names.get(new Integer(vAlign))); - b.setWidth("100"); - l.setComponentAlignment(b, hAlign, vAlign); + b.setWidth("100px"); + ((AlignmentHandler) l).setComponentAlignment(b, hAlign, vAlign); return b; diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1966_2.java b/src/com/itmill/toolkit/tests/tickets/Ticket1966_2.java index b4ec296a3f..5e8f3b1e91 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1966_2.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1966_2.java @@ -166,18 +166,18 @@ public class Ticket1966_2 extends Application { } - private void addButtons(AlignmentHandler ol) { + private void addButtons(Layout ol) { ol.addComponent(getButton(ol, LEFT, TOP)); ol.addComponent(getButton(ol, CENTER, VCENTER)); ol.addComponent(getButton(ol, RIGHT, BOTTOM)); } - private Button getButton(AlignmentHandler l, int hAlign, int vAlign) { + private Button getButton(Layout l, int hAlign, int vAlign) { Button b = new Button(names.get(new Integer(hAlign)) + " - " + names.get(new Integer(vAlign))); // b.setWidth("100"); - l.setComponentAlignment(b, hAlign, vAlign); + ((AlignmentHandler) l).setComponentAlignment(b, hAlign, vAlign); return b; diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1966_3.java b/src/com/itmill/toolkit/tests/tickets/Ticket1966_3.java index e46e6a5f1c..d9f2df08b1 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1966_3.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1966_3.java @@ -23,19 +23,19 @@ public class Ticket1966_3 extends Application { private void createUI(GridLayout layout) { OrderedLayout ol = new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL); Panel p = new Panel(ol); - p.setWidth("300"); - p.setHeight("300"); + p.setWidth("300px"); + p.setHeight("300px"); p.getLayout().setSizeFull(); TextField tf = new TextField("Long caption, longer than 100 pixels"); - tf.setWidth("100"); + tf.setWidth("100px"); ol.addComponent(tf); ol.setComponentAlignment(tf, OrderedLayout.ALIGNMENT_RIGHT, OrderedLayout.ALIGNMENT_TOP); tf = new TextField("Short caption"); - tf.setWidth("100"); + tf.setWidth("100px"); tf.setComponentError(new UserError("error message")); ol.addComponent(tf); @@ -45,7 +45,7 @@ public class Ticket1966_3 extends Application { tf = new TextField("Short caption"); tf.setComponentError(new UserError("error message")); tf.setIcon(new ThemeResource("icons/16/calendar.png")); - tf.setWidth("100"); + tf.setWidth("100px"); tf.setComponentError(new UserError("error message")); ol.addComponent(tf); @@ -54,7 +54,7 @@ public class Ticket1966_3 extends Application { tf = new TextField(); tf.setValue("No caption"); - tf.setWidth("100"); + tf.setWidth("100px"); ol.addComponent(tf); ol.setComponentAlignment(tf, OrderedLayout.ALIGNMENT_RIGHT, diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2021.java b/src/com/itmill/toolkit/tests/tickets/Ticket2021.java index 4897ccb6b8..aacdfad8aa 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2021.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2021.java @@ -24,6 +24,8 @@ public class Ticket2021 extends Application { + "Nulla nisi. Sed blandit, ante vitae sagittis volutpat, arcu mauris vehicula risus, vitae posuere felis lectus sit amet purus. Donec nec magna et leo eleifend scelerisque. Suspendisse condimentum pharetra ligula. Curabitur lorem. Pellentesque a augue sit amet enim fermentum placerat. Phasellus ante risus, molestie at, iaculis at, pellentesque non, tellus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Phasellus non urna eget risus tempus imperdiet. Integer est diam, sagittis sit amet, posuere sit amet, bibendum sed, lacus. Aenean adipiscing cursus ipsum. Quisque at elit. Vestibulum vitae nunc. Praesent placerat metus viverra lorem. Cras nec elit congue nisi faucibus feugiat. Nam eget mi. Vestibulum condimentum. Nunc nisl ante, cursus in, dictum ac, lobortis rutrum, mi. Nulla eu nisi. In ultricies vehicula magna." + "Nunc eros dui, elementum at, ullamcorper eget, varius at, velit. Ut dictum. Cras ullamcorper ante vel tortor. Quisque viverra mauris vulputate quam. Nulla dui. Suspendisse non eros at ipsum faucibus hendrerit. Morbi dignissim pharetra tortor. Etiam malesuada. Mauris lacinia elementum erat. Duis mollis placerat metus. Nunc risus felis, cursus ac, cursus vel, convallis vel, metus. Ut vehicula nibh et nulla. Vivamus id pede. Quisque egestas arcu a ligula. Maecenas vehicula. Quisque sed ligula quis tellus tempus rutrum. Curabitur vel augue sed orci egestas pharetra. Duis pharetra."; + private OrderedLayout orderedLayout; + public void init() { Window w = new Window(getClass().getSimpleName()); w.setLayout(new GridLayout(2, 2)); @@ -31,8 +33,8 @@ public class Ticket2021 extends Application { Panel p = new Panel(); p.setCaption("ExpandLayout"); - p.setWidth(500); - p.setHeight(500); + p.setWidth("500px"); + p.setHeight("500px"); p.setLayout(new ExpandLayout()); p.getLayout().setSizeFull(); @@ -52,8 +54,8 @@ public class Ticket2021 extends Application { Panel p2 = new Panel(); p2.setCaption("OrderedLayout"); - p2.setWidth(500); - p2.setHeight(500); + p2.setWidth("500px"); + p2.setHeight("500px"); p2.setLayout(new OrderedLayout()); p2.getLayout().setSizeFull(); @@ -93,14 +95,14 @@ public class Ticket2021 extends Application { // p3.getLayout().addComponent(tf3); gl.addComponent(tf3); - // p = new Panel(); - // p.setCaption("OrderedLayout"); - // p.setWidth(500); - // p.setHeight(500); - // p.getLayout().setSizeFull(); + // Panel pp = new Panel(); + // pp.setCaption("OrderedLayout"); + // pp.setWidth("500px"); + // pp.setHeight("500px"); + // pp.getLayout().setSizeFull(); // orderedLayout = new OrderedLayout(); - // p.getLayout().addComponent(orderedLayout); - // w.getLayout().addComponent(p); + // pp.getLayout().addComponent(orderedLayout); + // w.getLayout().addComponent(pp); // createUI(orderedLayout); } @@ -111,15 +113,17 @@ public class Ticket2021 extends Application { new ClickListener() { public void buttonClick(ClickEvent event) { - System.out.println("Enable caption"); - AbstractComponent l = tf1; - // Layout l = (Layout) event.getButton().getData(); - if (l.getCaption() == null) { - l.setCaption("Expand layout caption"); - } else { - l.setCaption(null); + System.out.println("Enable/disable caption"); + for (AbstractComponent l : new AbstractComponent[] { + tf1, tf2, tf3 }) { + // AbstractComponent l = tf2; + // Layout l = (Layout) event.getButton().getData(); + if (l.getCaption() == null) { + l.setCaption("Expand layout caption"); + } else { + l.setCaption(null); + } } - } }); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2061.java b/src/com/itmill/toolkit/tests/tickets/Ticket2061.java index fb4eec35de..4f364e875f 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2061.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2061.java @@ -19,7 +19,7 @@ public class Ticket2061 extends Application { @Override public void init() { - mainWindow = new Window("It Mill"); + mainWindow = new Window("Ticket 2061"); mainWindow.setSizeFull(); mainWindow.getLayout().setSizeFull(); setMainWindow(mainWindow); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2061b.java b/src/com/itmill/toolkit/tests/tickets/Ticket2061b.java index 09d8b6ab51..4e5240f773 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2061b.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2061b.java @@ -63,7 +63,7 @@ public class Ticket2061b extends Application implements tf.setHeight("2500px"); tf.setWidth("2500px"); - Tabs tab = new Tabs(new Component[] { p, a, tf }); + TabsAcc tab = new TabsAcc(new Component[] { p, a, tf }); tab.addListener(this); mainLayout.addComponent(sp); @@ -165,6 +165,19 @@ public class Ticket2061b extends Application implements } + public class TabsAcc extends Accordion { + + public TabsAcc(Component[] components) { + this.setWidth("100%"); + this.setHeight("100%"); + for (int i = 0; i < components.length; i++) { + this.addTab(components[i], components[i].getDebugId(), null); + } + + } + + } + public class MyAccordion extends Accordion { public MyAccordion(Component[] components, String id) { diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2095.java b/src/com/itmill/toolkit/tests/tickets/Ticket2095.java index bf0b834939..d0d471b190 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2095.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2095.java @@ -17,7 +17,9 @@ public class Ticket2095 extends Application { Embedded em = new Embedded(); em.setType(Embedded.TYPE_BROWSER); - em.setSource(new ExternalResource("/statictestfiles/ticket2095.html")); + em + .setSource(new ExternalResource( + "../statictestfiles/ticket2095.html")); em.setDebugId("MYIFRAME"); em.setSizeFull(); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2204.java b/src/com/itmill/toolkit/tests/tickets/Ticket2204.java index 0d90373944..b3f42d775f 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2204.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2204.java @@ -178,6 +178,7 @@ public class Ticket2204 extends Application { sp.setWidth("300px"); sp.setHeight("300px"); sp.addComponent(new Label("Label")); + textArea.setSizeFull(); } if (c == Panel.class) { Layout layout = ((Panel) cc).getLayout(); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2232.java b/src/com/itmill/toolkit/tests/tickets/Ticket2232.java index cbc6efe64f..bf27ad3a66 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2232.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2232.java @@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Label; import com.itmill.toolkit.ui.Layout; import com.itmill.toolkit.ui.OrderedLayout; import com.itmill.toolkit.ui.Window; +import com.itmill.toolkit.ui.Layout.SpacingHandler; public class Ticket2232 extends Application { @@ -20,7 +21,7 @@ public class Ticket2232 extends Application { new Label( "Defining spacing must be possible also with pure CSS")); - Layout.SpacingHandler gl; + Layout gl; gl = new OrderedLayout(); gl.setWidth("100%"); gl.setHeight("200px"); @@ -36,13 +37,13 @@ public class Ticket2232 extends Application { gl = new OrderedLayout(); gl.setWidth("100%"); gl.setHeight("200px"); - gl.setSpacing(true); + ((SpacingHandler) gl).setSpacing(true); fillAndAdd(gl); gl = new GridLayout(); gl.setWidth("100%"); gl.setHeight("200px"); - gl.setSpacing(true); + ((SpacingHandler) gl).setSpacing(true); fillAndAdd(gl); gl = new OrderedLayout(); @@ -57,7 +58,7 @@ public class Ticket2232 extends Application { } - private void fillAndAdd(Layout.SpacingHandler gl) { + private void fillAndAdd(Layout gl) { for (int i = 0; i < 4; i++) { Button b = new Button("B"); b.setSizeFull(); @@ -65,7 +66,7 @@ public class Ticket2232 extends Application { } String caption = gl.getClass().getSimpleName(); caption += " style: " + gl.getStyleName() + ", spacingFromServer:" - + gl.isSpacingEnabled(); + + ((SpacingHandler) gl).isSpacingEnabled(); gl.setCaption(caption); getMainWindow().addComponent(gl); } -- 2.39.5