diff options
Diffstat (limited to 'tests')
6 files changed, 204 insertions, 204 deletions
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java b/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java index bd67841f33..1971fb6d0e 100644 --- a/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java +++ b/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java @@ -1,14 +1,14 @@ package com.vaadin.tests.server.component.abstractorderedlayout; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.fail; - import java.util.Iterator; import java.util.NoSuchElementException; import org.junit.Test; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.fail; + import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Component; import com.vaadin.ui.HorizontalLayout; diff --git a/tests/server-side/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java b/tests/server-side/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java index d4a0592768..c0d739b597 100644 --- a/tests/server-side/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java +++ b/tests/server-side/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java @@ -5,8 +5,8 @@ import java.util.NoSuchElementException; import org.junit.Test; -import static org.junit.Assert.assertSame; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertSame; import static org.junit.Assert.fail; import com.vaadin.ui.Component; diff --git a/tests/server-side/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTest.java b/tests/server-side/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTest.java index 9271e9f1b3..e3e743d02a 100644 --- a/tests/server-side/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTest.java +++ b/tests/server-side/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTest.java @@ -1,84 +1,84 @@ -package com.vaadin.tests.server.componentcontainer;
-
-import junit.framework.TestCase;
-
-import com.vaadin.ui.Component;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.Layout;
-
-public abstract class AbstractIndexedLayoutTest extends TestCase {
-
- private Layout layout;
-
- protected abstract Layout createLayout();
-
- @Override
- protected void setUp() throws Exception {
- layout = createLayout();
- }
-
- public Layout getLayout() {
- return layout;
- }
-
- public void testAddRemoveComponent() {
- Label c1 = new Label();
- Label c2 = new Label();
-
- layout.addComponent(c1);
-
- assertEquals(c1, getComponent(0));
- assertEquals(1, getComponentCount());
- layout.addComponent(c2);
- assertEquals(c1, getComponent(0));
- assertEquals(c2, getComponent(1));
- assertEquals(2, getComponentCount());
- layout.removeComponent(c1);
- assertEquals(c2, getComponent(0));
- assertEquals(1, getComponentCount());
- layout.removeComponent(c2);
- assertEquals(0, getComponentCount());
- }
-
- protected abstract int getComponentCount();
-
- protected abstract Component getComponent(int index);
-
- protected abstract int getComponentIndex(Component c);
-
- public void testGetComponentIndex() {
- Label c1 = new Label();
- Label c2 = new Label();
-
- layout.addComponent(c1);
- assertEquals(0, getComponentIndex(c1));
- layout.addComponent(c2);
- assertEquals(0, getComponentIndex(c1));
- assertEquals(1, getComponentIndex(c2));
- layout.removeComponent(c1);
- assertEquals(0, getComponentIndex(c2));
- layout.removeComponent(c2);
- assertEquals(-1, getComponentIndex(c2));
- assertEquals(-1, getComponentIndex(c1));
- }
-
- public void testGetComponent() {
- Label c1 = new Label();
- Label c2 = new Label();
-
- layout.addComponent(c1);
- assertEquals(c1, getComponent(0));
- layout.addComponent(c2);
- assertEquals(c1, getComponent(0));
- assertEquals(c2, getComponent(1));
- layout.removeComponent(c1);
- assertEquals(c2, getComponent(0));
- layout.removeComponent(c2);
- try {
- getComponent(0);
- fail();
- } catch (IndexOutOfBoundsException e) {
- // Expected
- }
- }
-}
+package com.vaadin.tests.server.componentcontainer; + +import junit.framework.TestCase; + +import com.vaadin.ui.Component; +import com.vaadin.ui.Label; +import com.vaadin.ui.Layout; + +public abstract class AbstractIndexedLayoutTest extends TestCase { + + private Layout layout; + + protected abstract Layout createLayout(); + + @Override + protected void setUp() throws Exception { + layout = createLayout(); + } + + public Layout getLayout() { + return layout; + } + + public void testAddRemoveComponent() { + Label c1 = new Label(); + Label c2 = new Label(); + + layout.addComponent(c1); + + assertEquals(c1, getComponent(0)); + assertEquals(1, getComponentCount()); + layout.addComponent(c2); + assertEquals(c1, getComponent(0)); + assertEquals(c2, getComponent(1)); + assertEquals(2, getComponentCount()); + layout.removeComponent(c1); + assertEquals(c2, getComponent(0)); + assertEquals(1, getComponentCount()); + layout.removeComponent(c2); + assertEquals(0, getComponentCount()); + } + + protected abstract int getComponentCount(); + + protected abstract Component getComponent(int index); + + protected abstract int getComponentIndex(Component c); + + public void testGetComponentIndex() { + Label c1 = new Label(); + Label c2 = new Label(); + + layout.addComponent(c1); + assertEquals(0, getComponentIndex(c1)); + layout.addComponent(c2); + assertEquals(0, getComponentIndex(c1)); + assertEquals(1, getComponentIndex(c2)); + layout.removeComponent(c1); + assertEquals(0, getComponentIndex(c2)); + layout.removeComponent(c2); + assertEquals(-1, getComponentIndex(c2)); + assertEquals(-1, getComponentIndex(c1)); + } + + public void testGetComponent() { + Label c1 = new Label(); + Label c2 = new Label(); + + layout.addComponent(c1); + assertEquals(c1, getComponent(0)); + layout.addComponent(c2); + assertEquals(c1, getComponent(0)); + assertEquals(c2, getComponent(1)); + layout.removeComponent(c1); + assertEquals(c2, getComponent(0)); + layout.removeComponent(c2); + try { + getComponent(0); + fail(); + } catch (IndexOutOfBoundsException e) { + // Expected + } + } +} diff --git a/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.java b/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.java index f2726118d4..eacf2a0e53 100644 --- a/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.java +++ b/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.java @@ -1,45 +1,45 @@ -package com.vaadin.tests.application;
-
-import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Label;
-
-public class WebBrowserSizeTest extends TestBase {
-
- @Override
- protected void setup() {
-
- final Label screenSizeLabel = new Label("n/a");
- screenSizeLabel.setCaption("Screen size");
-
- final Label browserSizeLabel = new Label("n/a");
- browserSizeLabel.setCaption("Client (browser window) size");
-
- final Button update = new Button("Refresh", new Button.ClickListener() {
-
- public void buttonClick(ClickEvent event) {
- screenSizeLabel.setValue(getBrowser().getScreenWidth() + " x "
- + getBrowser().getScreenHeight());
- browserSizeLabel.setValue(getBrowser().getClientWidth() + " x "
- + getBrowser().getClientHeight());
- }
- });
-
- addComponent(update);
- addComponent(screenSizeLabel);
- addComponent(browserSizeLabel);
-
- }
-
- @Override
- protected String getDescription() {
- return "Verifies that browser sizes are reported correctly. Note that client width differs depending on browser decorations.";
- }
-
- @Override
- protected Integer getTicketNumber() {
- return 5655;
- }
-
-}
+package com.vaadin.tests.application; + +import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Label; + +public class WebBrowserSizeTest extends TestBase { + + @Override + protected void setup() { + + final Label screenSizeLabel = new Label("n/a"); + screenSizeLabel.setCaption("Screen size"); + + final Label browserSizeLabel = new Label("n/a"); + browserSizeLabel.setCaption("Client (browser window) size"); + + final Button update = new Button("Refresh", new Button.ClickListener() { + + public void buttonClick(ClickEvent event) { + screenSizeLabel.setValue(getBrowser().getScreenWidth() + " x " + + getBrowser().getScreenHeight()); + browserSizeLabel.setValue(getBrowser().getClientWidth() + " x " + + getBrowser().getClientHeight()); + } + }); + + addComponent(update); + addComponent(screenSizeLabel); + addComponent(browserSizeLabel); + + } + + @Override + protected String getDescription() { + return "Verifies that browser sizes are reported correctly. Note that client width differs depending on browser decorations."; + } + + @Override + protected Integer getTicketNumber() { + return 5655; + } + +} diff --git a/tests/testbench/com/vaadin/tests/application/WebBrowserTest.java b/tests/testbench/com/vaadin/tests/application/WebBrowserTest.java index 4508e4ef90..35235bbe1f 100644 --- a/tests/testbench/com/vaadin/tests/application/WebBrowserTest.java +++ b/tests/testbench/com/vaadin/tests/application/WebBrowserTest.java @@ -71,6 +71,7 @@ public class WebBrowserTest extends TestBase { curDateLabel.setValue(getBrowser().getCurrentDate() .toString()); + } }); @@ -82,7 +83,6 @@ public class WebBrowserTest extends TestBase { addComponent(curDateLabel); addComponent(diffLabel); addComponent(containsLabel); - } @Override diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java index 4fc8f87398..357c61f4f6 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java @@ -1,69 +1,69 @@ -package com.vaadin.tests.components.datefield;
-
-import java.util.Calendar;
-import java.util.Locale;
-
-import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.DateField;
-import com.vaadin.ui.PopupDateField;
-
-@SuppressWarnings("serial")
-public class PopupDateFieldExtendedRange extends TestBase {
-
- private Calendar date = Calendar.getInstance();
-
- @Override
- protected void setup() {
- date.set(2011, 0, 1);
-
- getLayout().setSpacing(true);
-
- final PopupDateField[] fields = new PopupDateField[3];
-
- fields[0] = makeDateField();
- fields[0].setLocale(new Locale("fi", "FI"));
- fields[0].setCaption("Finnish locale");
-
- fields[1] = makeDateField();
- fields[1].setLocale(new Locale("en", "US"));
- fields[1].setCaption("US English locale");
-
- fields[2] = makeDateField();
- fields[2].setLocale(new Locale("fi", "FI"));
- fields[2].setShowISOWeekNumbers(true);
- fields[2].setCaption("Finnish locale with week numbers");
-
- for (PopupDateField f : fields) {
- addComponent(f);
- }
-
- addComponent(new Button("Change date", new ClickListener() {
- public void buttonClick(ClickEvent event) {
- date.set(2010, 1, 16);
- for (PopupDateField f : fields) {
- f.setValue(date.getTime());
- }
- }
- }));
- }
-
- @Override
- protected String getDescription() {
- return "Show a few days of the preceding and following months in the datefield popup";
- }
-
- @Override
- protected Integer getTicketNumber() {
- return 6718;
- }
-
- private PopupDateField makeDateField() {
- PopupDateField pdf = new PopupDateField();
- pdf.setResolution(DateField.RESOLUTION_DAY);
- pdf.setValue(date.getTime());
- return pdf;
- }
-}
+package com.vaadin.tests.components.datefield; + +import java.util.Calendar; +import java.util.Locale; + +import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.DateField; +import com.vaadin.ui.PopupDateField; + +@SuppressWarnings("serial") +public class PopupDateFieldExtendedRange extends TestBase { + + private Calendar date = Calendar.getInstance(); + + @Override + protected void setup() { + date.set(2011, 0, 1); + + getLayout().setSpacing(true); + + final PopupDateField[] fields = new PopupDateField[3]; + + fields[0] = makeDateField(); + fields[0].setLocale(new Locale("fi", "FI")); + fields[0].setCaption("Finnish locale"); + + fields[1] = makeDateField(); + fields[1].setLocale(new Locale("en", "US")); + fields[1].setCaption("US English locale"); + + fields[2] = makeDateField(); + fields[2].setLocale(new Locale("fi", "FI")); + fields[2].setShowISOWeekNumbers(true); + fields[2].setCaption("Finnish locale with week numbers"); + + for (PopupDateField f : fields) { + addComponent(f); + } + + addComponent(new Button("Change date", new ClickListener() { + public void buttonClick(ClickEvent event) { + date.set(2010, 1, 16); + for (PopupDateField f : fields) { + f.setValue(date.getTime()); + } + } + })); + } + + @Override + protected String getDescription() { + return "Show a few days of the preceding and following months in the datefield popup"; + } + + @Override + protected Integer getTicketNumber() { + return 6718; + } + + private PopupDateField makeDateField() { + PopupDateField pdf = new PopupDateField(); + pdf.setResolution(DateField.RESOLUTION_DAY); + pdf.setValue(date.getTime()); + return pdf; + } +} |