summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2014-03-19 16:30:23 +0200
committerArtur Signell <artur@vaadin.com>2014-03-19 16:32:32 +0200
commit227a937af1d844f7372a5a3071c1e204e25a49c0 (patch)
tree9428bffbb09cfadb9fd3ec932652a96fc52b76f4 /uitest
parent23891f2519410d174e9e923e2ca5842c78c8e757 (diff)
downloadvaadin-framework-227a937af1d844f7372a5a3071c1e204e25a49c0.tar.gz
vaadin-framework-227a937af1d844f7372a5a3071c1e204e25a49c0.zip
Format project files according to conventions
Change-Id: I2522698237eb2a21c0896605bed8e73a82795c97
Diffstat (limited to 'uitest')
-rw-r--r--uitest/src/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.java18
-rw-r--r--uitest/src/com/vaadin/tests/push/TrackMessageSizeUITest.java4
-rw-r--r--uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java3
3 files changed, 17 insertions, 8 deletions
diff --git a/uitest/src/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.java b/uitest/src/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.java
index b8b55048f9..60e8720d44 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.java
+++ b/uitest/src/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.java
@@ -21,7 +21,8 @@ public class TestHideTimeAndSeparator extends AbstractTestUI {
private final String caption;
private final boolean hideTime;
- public GenericEvent(Date start, Date end, String caption, boolean hideTime) {
+ public GenericEvent(Date start, Date end, String caption,
+ boolean hideTime) {
this.start = start;
this.end = end;
this.caption = caption;
@@ -60,10 +61,16 @@ public class TestHideTimeAndSeparator extends AbstractTestUI {
}
- CalendarEvent shortEventHidden = new GenericEvent(makeDate(2013, 1, 2, 8, 0), makeDate(2013, 1, 2, 8, 30), "Short event", true);
- CalendarEvent longEventHidden = new GenericEvent(makeDate(2013, 1, 2, 10, 0), makeDate(2013, 1, 2, 12, 0), "Long event", true);
- CalendarEvent shortEvent = new GenericEvent(makeDate(2013, 1, 3, 8, 0), makeDate(2013, 1, 3, 8, 30), "Short event", false);
- CalendarEvent longEvent = new GenericEvent(makeDate(2013, 1, 3, 10, 0), makeDate(2013, 1, 3, 12, 0), "Long event", false);
+ CalendarEvent shortEventHidden = new GenericEvent(
+ makeDate(2013, 1, 2, 8, 0), makeDate(2013, 1, 2, 8, 30),
+ "Short event", true);
+ CalendarEvent longEventHidden = new GenericEvent(
+ makeDate(2013, 1, 2, 10, 0), makeDate(2013, 1, 2, 12, 0),
+ "Long event", true);
+ CalendarEvent shortEvent = new GenericEvent(makeDate(2013, 1, 3, 8, 0),
+ makeDate(2013, 1, 3, 8, 30), "Short event", false);
+ CalendarEvent longEvent = new GenericEvent(makeDate(2013, 1, 3, 10, 0),
+ makeDate(2013, 1, 3, 12, 0), "Long event", false);
@Override
protected void setup(VaadinRequest request) {
@@ -100,6 +107,7 @@ public class TestHideTimeAndSeparator extends AbstractTestUI {
juc.set(year, month, day, hour, minute);
return juc.getTime();
}
+
private Date makeDate(int year, int month, int day) {
java.util.Calendar juc = java.util.Calendar.getInstance();
juc.set(year, month, day);
diff --git a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUITest.java b/uitest/src/com/vaadin/tests/push/TrackMessageSizeUITest.java
index f904675b5e..2fc868d4ed 100644
--- a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUITest.java
+++ b/uitest/src/com/vaadin/tests/push/TrackMessageSizeUITest.java
@@ -24,7 +24,7 @@ public class TrackMessageSizeUITest extends MultiBrowserTest {
@Test
public void runTests() {
openTestURL();
- Assert.assertEquals("1. All tests run",
- vaadinElementById("Log_row_0").getText());
+ Assert.assertEquals("1. All tests run", vaadinElementById("Log_row_0")
+ .getText());
}
} \ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java b/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
index 400a2fe429..a00ff7ab4d 100644
--- a/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
+++ b/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
@@ -125,7 +125,8 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
|| nwInterface.isVirtual()) {
continue;
}
- Enumeration<InetAddress> addresses = nwInterface.getInetAddresses();
+ Enumeration<InetAddress> addresses = nwInterface
+ .getInetAddresses();
while (addresses.hasMoreElements()) {
InetAddress address = addresses.nextElement();
if (address.isLoopbackAddress()) {