diff options
Diffstat (limited to 'uitest/src/main/java')
5 files changed, 52 insertions, 47 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTimeZones.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTimeZones.java index be7cd1456b..bb8ab2b238 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTimeZones.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTimeZones.java @@ -27,9 +27,9 @@ public class DateFieldTimeZones extends AbstractTestUI { d1.setValue(LocalDate.of(2018, 1, 1)); d2.setValue(LocalDate.of(2019, 12, 1)); - d3.setValue(LocalDateTime.of(2019, 12, 1,0,0,0)); - d4.setValue(LocalDateTime.of(2019, 12, 1,0,0,0)); - d4.setValue(LocalDateTime.of(2019, 12, 1,0,0,0)); + d3.setValue(LocalDateTime.of(2019, 12, 1, 0, 0, 0)); + d4.setValue(LocalDateTime.of(2019, 12, 1, 0, 0, 0)); + d4.setValue(LocalDateTime.of(2019, 12, 1, 0, 0, 0)); d1.setResolution(DateResolution.DAY); d2.setResolution(DateResolution.DAY); @@ -37,15 +37,15 @@ public class DateFieldTimeZones extends AbstractTestUI { d2.setRangeStart(LocalDate.of(2018, 1, 1)); d2.setRangeEnd(LocalDate.of(2019, 12, 1)); - d3.setRangeStart(LocalDateTime.of(2018, 1, 1,0,0,0)); - d3.setRangeEnd(LocalDateTime.of(2019, 12, 1,0,0,0)); + d3.setRangeStart(LocalDateTime.of(2018, 1, 1, 0, 0, 0)); + d3.setRangeEnd(LocalDateTime.of(2019, 12, 1, 0, 0, 0)); - d5.setRangeStart(LocalDateTime.of(2018, 1, 1,0,0,0)); - d5.setRangeEnd(LocalDateTime.of(2019, 12, 1,0,0,0)); + d5.setRangeStart(LocalDateTime.of(2018, 1, 1, 0, 0, 0)); + d5.setRangeEnd(LocalDateTime.of(2019, 12, 1, 0, 0, 0)); d5.setZoneId(ZoneId.of("-10")); HorizontalLayout layout = new HorizontalLayout(); - layout.addComponents(d1, d2,d3,d4,d5); + layout.addComponents(d1, d2, d3, d4, d5); addComponent(layout); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/DynamicViewport.java b/uitest/src/main/java/com/vaadin/tests/components/ui/DynamicViewport.java index 59cf7bad50..2405b0a11d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/DynamicViewport.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/DynamicViewport.java @@ -9,20 +9,25 @@ import com.vaadin.ui.Label; @ViewportGeneratorClass(MyViewportGenerator.class) public class DynamicViewport extends AbstractReindeerTestUI { + + public static final String VIEWPORT_DISABLE_PARAMETER = "noViewport"; + public static class MyViewportGenerator implements ViewportGenerator { @Override public String getViewport(VaadinRequest request) { - String userAgent = request.getHeader("User-Agent"); - System.out.println(userAgent); - if (userAgent == null || userAgent.contains("Chrome")) { + if (request.getParameterMap() + .containsKey(VIEWPORT_DISABLE_PARAMETER)) { return null; } - return userAgent; + return request.getHeader("User-Agent"); } } @Override protected void setup(VaadinRequest request) { - addComponent(new Label("I should have a dynamic viewport tag")); + String negation = request.getParameterMap() + .containsKey(VIEWPORT_DISABLE_PARAMETER) ? "not " : ""; + addComponent(new Label( + "I should " + negation + "have a dynamic viewport tag")); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/WindowAndUIShortcuts.java b/uitest/src/main/java/com/vaadin/tests/components/ui/WindowAndUIShortcuts.java index 950d653bfc..35daffd0a4 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/WindowAndUIShortcuts.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/WindowAndUIShortcuts.java @@ -20,36 +20,33 @@ public class WindowAndUIShortcuts extends UI { final VerticalLayout mainLayout = new VerticalLayout(); - mainLayout.addComponent( - new Button("Show page", event -> { - final VerticalLayout pageLayout = new VerticalLayout(); - pageLayout.setSpacing(true); - - pageLayout.addComponent(new Label("Page")); - pageLayout.addComponent(new Button("Open dialog window", - clickEvent -> { - Window dialog = new Window(); - dialog.setModal(true); - dialog.setCaption("Press ESC shortcut"); - dialog.setWidth("300px"); - dialog.setHeight("100px"); - - dialog.setContent( - new TextField("TextField in window")); - addWindow(dialog); - })); - Button closeButton = new Button("Close page", - clickEvent -> { - mainLayout.removeComponent(pageLayout); - - Notification.show("OMG! Page is also closed!"); - }); - closeButton.setClickShortcut(ShortcutAction.KeyCode.ESCAPE); - pageLayout.addComponent(closeButton); - - mainLayout.addComponent(pageLayout); - mainLayout.setExpandRatio(pageLayout, 1); - })); + mainLayout.addComponent(new Button("Show page", event -> { + final VerticalLayout pageLayout = new VerticalLayout(); + pageLayout.setSpacing(true); + + pageLayout.addComponent(new Label("Page")); + pageLayout.addComponent( + new Button("Open dialog window", clickEvent -> { + Window dialog = new Window(); + dialog.setModal(true); + dialog.setCaption("Press ESC shortcut"); + dialog.setWidth("300px"); + dialog.setHeight("100px"); + + dialog.setContent(new Button("Button in window")); + addWindow(dialog); + })); + Button closeButton = new Button("Close page", clickEvent -> { + mainLayout.removeComponent(pageLayout); + + Notification.show("OMG! Page is also closed!"); + }); + closeButton.setClickShortcut(ShortcutAction.KeyCode.ESCAPE); + pageLayout.addComponent(closeButton); + + mainLayout.addComponent(pageLayout); + mainLayout.setExpandRatio(pageLayout, 1); + })); layout.addComponent(mainLayout); layout.setExpandRatio(mainLayout, 1); diff --git a/uitest/src/main/java/com/vaadin/tests/elements/window/WindowUI.java b/uitest/src/main/java/com/vaadin/tests/elements/window/WindowUI.java index 0cdde86ba4..41b45510ad 100644 --- a/uitest/src/main/java/com/vaadin/tests/elements/window/WindowUI.java +++ b/uitest/src/main/java/com/vaadin/tests/elements/window/WindowUI.java @@ -1,10 +1,12 @@ package com.vaadin.tests.elements.window; +import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Label; import com.vaadin.ui.Window; +@Theme("tests-valo-disabled-animations") public class WindowUI extends AbstractTestUI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java b/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java index 46459b9d6f..6f4c8b1d2f 100644 --- a/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java +++ b/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java @@ -250,9 +250,10 @@ public class SerializerTest extends AbstractReindeerTestUI { state.list = Arrays.asList(ContentMode.HTML); rpc.sendDate(new Date(1)); - rpc.sendDate(new Date(2013 - 1900, 5 - 1, 31, 11, 12, 13)); - rpc.sendDateArray(new Date[] { new Date(2013 - 1900, 1, 1), - new Date(2012 - 1900, 1, 1) }); + rpc.sendDate(new Date(Date.UTC(2013 - 1900, 4, 1, 11, 12, 13))); + rpc.sendDateArray( + new Date[] { new Date(Date.UTC(2013 - 1900, 0, 31, 0, 0, 0)), + new Date(Date.UTC(2012 - 1900, 0, 31, 0, 0, 0)) }); state.jsonNull = Json.createNull(); state.jsonString = Json.create("a string"); @@ -261,7 +262,7 @@ public class SerializerTest extends AbstractReindeerTestUI { state.dateArray = new Date[] { new Date(1), new Date(2) }; state.date1 = new Date(1); - state.date2 = new Date(2013 - 1900, 5 - 1, 31, 11, 12, 13); + state.date2 = new Date(Date.UTC(2013 - 1900, 4, 1, 11, 12, 13)); testExtension.registerRpc(new SerializerTestRpc() { @Override |