From aa65ddf683b33b873857803be17b61fb6a05aaa7 Mon Sep 17 00:00:00 2001 From: Teemu Suo-Anttila Date: Wed, 27 Jun 2018 11:36:02 +0300 Subject: Fix valdiation builds to use correct browser (#11000) --- uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java | 6 +++--- uitest/src/main/java/com/vaadin/tests/util/TestDataGenerator.java | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'uitest/src/main/java') diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java index 5262ed76af..5e32f377ae 100644 --- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java +++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java @@ -20,6 +20,7 @@ import com.vaadin.v7.ui.TextField; public class DateForm extends AbstractTestUIWithLog { + static final Date DATE = new Date(443457289789L); @PropertyId("date1") private DateField dateField; @PropertyId("date2") @@ -108,9 +109,8 @@ public class DateForm extends AbstractTestUIWithLog { addComponent(discardButton); addComponent(showBean); - DateObject d = new DateObject(new Date(443457289789L), - new Date(443543689789L), new Date(443457289789L), - new Date(443457289789L)); + DateObject d = new DateObject(DATE, new Date(443543689789L), DATE, + DATE); fieldGroup.setItemDataSource(new BeanItem<>(d)); } diff --git a/uitest/src/main/java/com/vaadin/tests/util/TestDataGenerator.java b/uitest/src/main/java/com/vaadin/tests/util/TestDataGenerator.java index 6e7b6ef31a..91912a0c2b 100644 --- a/uitest/src/main/java/com/vaadin/tests/util/TestDataGenerator.java +++ b/uitest/src/main/java/com/vaadin/tests/util/TestDataGenerator.java @@ -80,6 +80,9 @@ public class TestDataGenerator { c.set(Calendar.YEAR, r.nextInt(100) + 1900); c.set(Calendar.MONTH, r.nextInt(12)); c.set(Calendar.DAY_OF_MONTH, r.nextInt(31)); + c.set(Calendar.HOUR_OF_DAY, 11); + c.set(Calendar.HOUR, 11); + c.set(Calendar.AM_PM, Calendar.AM); return c.getTime(); } -- cgit v1.2.3