From 5a8158ea0075cd28af0ab4bba0416568287740c5 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Fri, 28 May 2010 08:25:44 +0000 Subject: Renamed test Ticket4582 svn changeset:13415/svn branch:6.3 --- .../components/datefield/DateFieldInSubWindow.html | 41 ++++++ .../components/datefield/DateFieldInSubWindow.java | 144 +++++++++++++++++++++ .../tests/components/datefield/Ticket4582.html | 42 ------ .../tests/components/datefield/Ticket4582.java | 133 ------------------- 4 files changed, 185 insertions(+), 175 deletions(-) create mode 100644 tests/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.html create mode 100644 tests/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java delete mode 100644 tests/src/com/vaadin/tests/components/datefield/Ticket4582.html delete mode 100644 tests/src/com/vaadin/tests/components/datefield/Ticket4582.java diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.html b/tests/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.html new file mode 100644 index 0000000000..f2ef2123f6 --- /dev/null +++ b/tests/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.html @@ -0,0 +1,41 @@ + + + + + + +DateFieldInSubWindow + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DateFieldInSubWindow
open/run/com.vaadin.tests.components.datefield.DateFieldInSubWindow?restartApplication
waitForVaadin
clickvaadin=runcomvaadintestscomponentsdatefieldDateFieldInSubWindow::/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]
waitForVaadin
screenCapture
+ + diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java b/tests/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java new file mode 100644 index 0000000000..2ab16f68e9 --- /dev/null +++ b/tests/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java @@ -0,0 +1,144 @@ +package com.vaadin.tests.components.datefield; + +import java.util.Date; + +import com.vaadin.data.Item; +import com.vaadin.data.util.BeanItem; +import com.vaadin.tests.components.AbstractTestCase; +import com.vaadin.ui.Button; +import com.vaadin.ui.Component; +import com.vaadin.ui.DateField; +import com.vaadin.ui.DefaultFieldFactory; +import com.vaadin.ui.Field; +import com.vaadin.ui.Form; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.Window; +import com.vaadin.ui.Button.ClickEvent; + +public class DateFieldInSubWindow extends AbstractTestCase { + + @SuppressWarnings("serial") + public class TestCaseWindow extends Window { + + public class MyBean { + private Date myDate; + private String myString; + + public Date getMyDate() { + return myDate; + } + + public void setMyDate(Date myDate) { + this.myDate = myDate; + } + + public String getMyString() { + return myString; + } + + public void setMyString(String myString) { + this.myString = myString; + } + + } + + private MyBean myBean; + + public TestCaseWindow() { + super("Test Case Window"); + setModal(true); + setWidth("400px"); + myBean = new MyBean(); + + initWindow(); + } + + protected class CustomerFieldFactory extends DefaultFieldFactory { + + public static final String COMMON_FIELD_WIDTH = "12em"; + + @Override + public Field createField(Item item, Object propertyId, + Component uiContext) { + Field f = super.createField(item, propertyId, uiContext); + + if ("myDate".equals(propertyId)) { + ((DateField) f).setResolution(DateField.RESOLUTION_MIN); + ((DateField) f).setCaption("This is my date"); + + } + + return f; + } + } + + protected void initWindow() { + VerticalLayout layout = (VerticalLayout) getContent(); + layout.setMargin(true); + layout.setSpacing(true); + + /** + * This causes the window to add the .v-readonly style! + */ + setClosable(false); + + CustomerFieldFactory fieldFactory = new CustomerFieldFactory(); + final Form generalForm = new Form(); + { + generalForm.setCaption("My form"); + generalForm.setWriteThrough(true); + generalForm.setFormFieldFactory(fieldFactory); + + BeanItem myBeanItem = new BeanItem(myBean); + generalForm.setItemDataSource(myBeanItem); + + generalForm.setVisibleItemProperties(new String[] { "myDate", + "myString" }); + generalForm.setValidationVisible(true); + addComponent(generalForm); + } + + HorizontalLayout buttons = new HorizontalLayout(); + { + buttons.setSpacing(true); + + Button b = new Button("Close", new Button.ClickListener() { + + public void buttonClick(ClickEvent event) { + ((Window) getParent()) + .removeWindow(TestCaseWindow.this); + } + }); + buttons.addComponent(b); + layout.addComponent(buttons); + + } + } + } + + @Override + public void init() { + Window mainWindow = new Window(); + setMainWindow(mainWindow); + Button open = new Button("Open window", new Button.ClickListener() { + public void buttonClick(ClickEvent event) { + getMainWindow().addWindow(new TestCaseWindow()); + } + }); + + mainWindow.addComponent(open); + } + + @Override + protected String getDescription() { + // TODO Auto-generated method stub + return null; + } + + @Override + protected Integer getTicketNumber() { + return 4582; + } + +} diff --git a/tests/src/com/vaadin/tests/components/datefield/Ticket4582.html b/tests/src/com/vaadin/tests/components/datefield/Ticket4582.html deleted file mode 100644 index ff38dbc988..0000000000 --- a/tests/src/com/vaadin/tests/components/datefield/Ticket4582.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - -Ticket4582 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Ticket4582
open/run/com.vaadin.tests.tickets.Ticket4582?restartApplication
waitForVaadin
clickvaadin=runcomvaadinteststicketsTicket4582::/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]
waitForVaadin
screenCapture
- - diff --git a/tests/src/com/vaadin/tests/components/datefield/Ticket4582.java b/tests/src/com/vaadin/tests/components/datefield/Ticket4582.java deleted file mode 100644 index f461354188..0000000000 --- a/tests/src/com/vaadin/tests/components/datefield/Ticket4582.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.vaadin.tests.components.datefield; - -import java.util.Date; - -import com.vaadin.Application; -import com.vaadin.data.Item; -import com.vaadin.data.util.BeanItem; -import com.vaadin.ui.Button; -import com.vaadin.ui.Component; -import com.vaadin.ui.DateField; -import com.vaadin.ui.DefaultFieldFactory; -import com.vaadin.ui.Field; -import com.vaadin.ui.Form; -import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; - -public class Ticket4582 extends Application{ - - @SuppressWarnings("serial") - public class TestCaseWindow extends Window { - - public class MyBean{ - private Date myDate; - private String myString; - - public Date getMyDate() { - return myDate; - } - - public void setMyDate(Date myDate) { - this.myDate = myDate; - } - - public String getMyString() { - return myString; - } - - public void setMyString(String myString) { - this.myString = myString; - } - - - } - private MyBean myBean; - - public TestCaseWindow() { - super("Test Case Window"); - setModal(true); - setWidth("400px"); - myBean = new MyBean(); - - - initWindow(); - } - - protected class CustomerFieldFactory extends DefaultFieldFactory { - - public static final String COMMON_FIELD_WIDTH = "12em"; - - @Override - public Field createField(Item item, Object propertyId, Component uiContext) { - Field f = super.createField(item, propertyId, uiContext); - - if ("myDate".equals(propertyId)) { - ((DateField) f).setResolution(DateField.RESOLUTION_MIN); - ((DateField) f).setCaption("This is my date"); - - } - - return f; - } - } - - protected void initWindow() { - VerticalLayout layout = (VerticalLayout) getContent(); - layout.setMargin(true); - layout.setSpacing(true); - - /** - * This causes the window to add the .v-readonly style! - */ - setClosable(false); - - CustomerFieldFactory fieldFactory = new CustomerFieldFactory(); - final Form generalForm = new Form(); - { - generalForm.setCaption("My form"); - generalForm.setWriteThrough(true); - generalForm.setFormFieldFactory(fieldFactory); - - BeanItem myBeanItem = new BeanItem(myBean); - generalForm.setItemDataSource(myBeanItem); - - generalForm.setVisibleItemProperties(new String[]{"myDate","myString"}); - generalForm.setValidationVisible(true); - addComponent(generalForm); - } - - - HorizontalLayout buttons = new HorizontalLayout(); - { - buttons.setSpacing(true); - - - Button b = new Button("Close", new Button.ClickListener() { - - public void buttonClick(ClickEvent event) { - ((Window) getParent()).removeWindow(TestCaseWindow.this); - } - }); - buttons.addComponent(b); - layout.addComponent(buttons); - - } - } - } - - @Override - public void init() { - Window mainWindow = new Window(); - setMainWindow(mainWindow); - Button open = new Button("Open window", new Button.ClickListener() { - public void buttonClick(ClickEvent event) { - getMainWindow().addWindow(new TestCaseWindow()); - } - }); - - mainWindow.addComponent(open); - } - -} -- cgit v1.2.3