aboutsummaryrefslogtreecommitdiffstats
path: root/client/src/test
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2016-08-18 09:27:03 +0300
committerArtur Signell <artur@vaadin.com>2016-08-18 09:27:03 +0300
commit6d54d78944f6c3278eed3bb5e7ee19687ee5714e (patch)
tree8142f622e644e98bb3f8d19a7021fd125f9fed40 /client/src/test
parent7b899665d07be33f86015f71695868c70bc5a589 (diff)
downloadvaadin-framework-6d54d78944f6c3278eed3bb5e7ee19687ee5714e.tar.gz
vaadin-framework-6d54d78944f6c3278eed3bb5e7ee19687ee5714e.zip
Format using Eclipse Neon
Change-Id: I33f1cc33969ff74a95b1b8cc0f2add589be5aae0
Diffstat (limited to 'client/src/test')
-rw-r--r--client/src/test/java/com/vaadin/client/ApplicationConnectionURLGenerationTest.java21
-rwxr-xr-xclient/src/test/java/com/vaadin/client/DateTimeServiceTest.java7
-rw-r--r--client/src/test/java/com/vaadin/client/VBrowserDetailsUserAgentParserTest.java7
-rw-r--r--client/src/test/java/com/vaadin/client/ui/grid/ListDataSourceTest.java4
4 files changed, 19 insertions, 20 deletions
diff --git a/client/src/test/java/com/vaadin/client/ApplicationConnectionURLGenerationTest.java b/client/src/test/java/com/vaadin/client/ApplicationConnectionURLGenerationTest.java
index 4dd2ddbaa4..8a84208ea8 100644
--- a/client/src/test/java/com/vaadin/client/ApplicationConnectionURLGenerationTest.java
+++ b/client/src/test/java/com/vaadin/client/ApplicationConnectionURLGenerationTest.java
@@ -10,10 +10,8 @@ public class ApplicationConnectionURLGenerationTest {
private static final String[] URIS = new String[] {
"http://demo.vaadin.com/", //
- "https://demo.vaadin.com/",
- "http://demo.vaadin.com/foo",
- "http://demo.vaadin.com/foo?f",
- "http://demo.vaadin.com/foo?f=1",
+ "https://demo.vaadin.com/", "http://demo.vaadin.com/foo",
+ "http://demo.vaadin.com/foo?f", "http://demo.vaadin.com/foo?f=1",
"http://demo.vaadin.com:1234/foo?a",
"http://demo.vaadin.com:1234/foo#frag?fakeparam",
// Jetspeed
@@ -41,8 +39,7 @@ public class ApplicationConnectionURLGenerationTest {
"http://demo.vaadin.com/foo?a=b&c=d#fragment",
"http://demo.vaadin.com/foo?f&a=b&c=d#fragment",
"http://demo.vaadin.com/foo?f=1&a=b&c=d#fragment",
- "http://demo.vaadin.com:1234/foo?a&a=b&c=d#fragment",
- "",
+ "http://demo.vaadin.com:1234/foo?a&a=b&c=d#fragment", "",
"http://localhost:8080/jetspeed/portal/_ns:Z3RlbXBsYXRlLXRvcDJfX3BhZ2UtdGVtcGxhdGVfX2RwLTFfX1AtMTJjNTRkYjdlYjUtMTAwMDJ8YzB8ZDF8aVVJREx8Zg__?a=b&c=d#fragment",
"http://vaadin.com/directory?p_p_id=Directory_WAR_Directory&p_p_lifecycle=2&p_p_state=normal&p_p_mode=view&p_p_resource_id=UIDL&p_p_cacheability=cacheLevelPage&p_p_col_id=row-1&p_p_col_count=1&a=b&c=d#fragment",
@@ -60,14 +57,14 @@ public class ApplicationConnectionURLGenerationTest {
// Fragments
if (URIS_WITH_ABCD_PARAM_AND_FRAGMENT[i].length() > 0) {
- assertEquals(URIS_WITH_ABCD_PARAM_AND_FRAGMENT[i],
- SharedUtil.addGetParameters(URIS[i] + "#fragment",
- "a=b&c=d"));
+ assertEquals(URIS_WITH_ABCD_PARAM_AND_FRAGMENT[i], SharedUtil
+ .addGetParameters(URIS[i] + "#fragment", "a=b&c=d"));
// Empty fragment
- assertEquals(URIS_WITH_ABCD_PARAM_AND_FRAGMENT[i].replace(
- "#fragment", "#"), SharedUtil.addGetParameters(URIS[i]
- + "#", "a=b&c=d"));
+ assertEquals(
+ URIS_WITH_ABCD_PARAM_AND_FRAGMENT[i]
+ .replace("#fragment", "#"),
+ SharedUtil.addGetParameters(URIS[i] + "#", "a=b&c=d"));
}
}
}
diff --git a/client/src/test/java/com/vaadin/client/DateTimeServiceTest.java b/client/src/test/java/com/vaadin/client/DateTimeServiceTest.java
index e5e6cbd7db..97eb22e87d 100755
--- a/client/src/test/java/com/vaadin/client/DateTimeServiceTest.java
+++ b/client/src/test/java/com/vaadin/client/DateTimeServiceTest.java
@@ -94,9 +94,10 @@ public class DateTimeServiceTest {
// System.out.println("Sample: " + d);
int expected = isoWeekNumbers.get(d);
int calculated = DateTimeService.getISOWeekNumber(d);
- Assert.assertEquals(d + " should be week " + expected
- + " (Java Calendar is wrong?)", expected,
- getCalendarISOWeekNr(d));
+ Assert.assertEquals(
+ d + " should be week " + expected
+ + " (Java Calendar is wrong?)",
+ expected, getCalendarISOWeekNr(d));
Assert.assertEquals(d + " should be week " + expected, expected,
calculated);
diff --git a/client/src/test/java/com/vaadin/client/VBrowserDetailsUserAgentParserTest.java b/client/src/test/java/com/vaadin/client/VBrowserDetailsUserAgentParserTest.java
index 41e675cb3a..c7eaf306fe 100644
--- a/client/src/test/java/com/vaadin/client/VBrowserDetailsUserAgentParserTest.java
+++ b/client/src/test/java/com/vaadin/client/VBrowserDetailsUserAgentParserTest.java
@@ -415,7 +415,8 @@ public class VBrowserDetailsUserAgentParserTest {
@Test
public void testIE9InIE8CompatibilityMode() {
- VBrowserDetails bd = new VBrowserDetails(IE9_BETA_IN_IE8_MODE_WINDOWS_7);
+ VBrowserDetails bd = new VBrowserDetails(
+ IE9_BETA_IN_IE8_MODE_WINDOWS_7);
// bd.setIE8InCompatibilityMode();
/*
@@ -621,8 +622,8 @@ public class VBrowserDetailsUserAgentParserTest {
assertFalse(browserDetails.isAndroid());
}
- private void assertAndroid(VBrowserDetails browserDetails,
- int majorVersion, int minorVersion) {
+ private void assertAndroid(VBrowserDetails browserDetails, int majorVersion,
+ int minorVersion) {
assertFalse(browserDetails.isLinux());
assertFalse(browserDetails.isWindows());
assertFalse(browserDetails.isMacOSX());
diff --git a/client/src/test/java/com/vaadin/client/ui/grid/ListDataSourceTest.java b/client/src/test/java/com/vaadin/client/ui/grid/ListDataSourceTest.java
index 24ccd6c57e..89a2e80679 100644
--- a/client/src/test/java/com/vaadin/client/ui/grid/ListDataSourceTest.java
+++ b/client/src/test/java/com/vaadin/client/ui/grid/ListDataSourceTest.java
@@ -185,8 +185,8 @@ public class ListDataSourceTest {
}
});
- assertTrue(Arrays.equals(ds.asList().toArray(), new Integer[] { 1, 2,
- 3, 3, 4 }));
+ assertTrue(Arrays.equals(ds.asList().toArray(),
+ new Integer[] { 1, 2, 3, 3, 4 }));
}
}