diff options
| author | Build Agent <build@vaadin.com> | 2014-02-27 13:42:58 +0200 |
|---|---|---|
| committer | Build Agent <build@vaadin.com> | 2014-02-27 13:42:58 +0200 |
| commit | 4029a132f01b9c7019f8aca75b0c94423a3e563d (patch) | |
| tree | 62c6bbdd243ced15519876f3bca32fe8edb2a197 /uitest/src | |
| parent | 45bae7affeeb1feb9da1857f73b17cdc363d25d2 (diff) | |
| parent | e961d43fd319148f5ab5fab452aed932105e363a (diff) | |
| download | vaadin-framework-4029a132f01b9c7019f8aca75b0c94423a3e563d.tar.gz vaadin-framework-4029a132f01b9c7019f8aca75b0c94423a3e563d.zip | |
Merge changes from origin/7.1
e961d43 Remove tooltip that's causing CalendarAcrionEventSourceTest failures
Change-Id: I738e4a91cfeccce15f76f6df1c1346c31225cde1
Diffstat (limited to 'uitest/src')
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/calendar/CalendarActionEventSource.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarActionEventSource.java b/uitest/src/com/vaadin/tests/components/calendar/CalendarActionEventSource.java index 5e81750e58..3a5d61d793 100644 --- a/uitest/src/com/vaadin/tests/components/calendar/CalendarActionEventSource.java +++ b/uitest/src/com/vaadin/tests/components/calendar/CalendarActionEventSource.java @@ -49,9 +49,8 @@ public class CalendarActionEventSource extends AbstractTestUI { CalendarEvent event = null; try { - event = new BasicEvent("NAME", "TOOLTIP", - new SimpleDateFormat("yyyy-MM-dd hh:mm") - .parse("2013-01-01 07:00"), + event = new BasicEvent("NAME", null, new SimpleDateFormat( + "yyyy-MM-dd hh:mm").parse("2013-01-01 07:00"), new SimpleDateFormat("yyyy-MM-dd hh:mm") .parse("2013-01-01 11:00")); } catch (ParseException e) { |