diff options
| author | Artur Signell <artur@vaadin.com> | 2015-01-14 10:18:39 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2015-01-14 10:18:39 +0200 |
| commit | 032bcef30f5ada7dc1ca6eade07ee596afa25bb3 (patch) | |
| tree | a036581c2b7ae7e82fdd60ba92b2fe392b85df7a /client/tests/src/com | |
| parent | 8a544b5a6e78337b24a5e56bcde1a21ff6087fae (diff) | |
| parent | b356e7e3bba9b08ad9d1ecdfb4d628b8179ef20a (diff) | |
| download | vaadin-framework-032bcef30f5ada7dc1ca6eade07ee596afa25bb3.tar.gz vaadin-framework-032bcef30f5ada7dc1ca6eade07ee596afa25bb3.zip | |
Merge remote-tracking branch 'origin/master' into grid
Conflicts:
client/src/com/vaadin/client/communication/AtmospherePushConnection.java
server/tests/src/com/vaadin/data/fieldgroup/FieldGroupTests.java
shared/src/com/vaadin/shared/util/SharedUtil.java
Change-Id: I300b5a92bde562390a56b720adf9a37b795c9513
Diffstat (limited to 'client/tests/src/com')
| -rw-r--r-- | client/tests/src/com/vaadin/client/ApplicationConnectionURLGenerationTest.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/client/tests/src/com/vaadin/client/ApplicationConnectionURLGenerationTest.java b/client/tests/src/com/vaadin/client/ApplicationConnectionURLGenerationTest.java index 36baa163cb..f529ba0886 100644 --- a/client/tests/src/com/vaadin/client/ApplicationConnectionURLGenerationTest.java +++ b/client/tests/src/com/vaadin/client/ApplicationConnectionURLGenerationTest.java @@ -4,6 +4,8 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; +import com.vaadin.shared.util.SharedUtil; + public class ApplicationConnectionURLGenerationTest { private static final String[] URIS = new String[] { @@ -51,23 +53,23 @@ public class ApplicationConnectionURLGenerationTest { for (int i = 0; i < URIS.length; i++) { // Adding nothing assertEquals(URIS[i], - ApplicationConnection.addGetParameters(URIS[i], "")); + SharedUtil.addGetParameters(URIS[i], "")); // Adding a=b&c=d assertEquals(URIS_WITH_ABCD_PARAM[i], - ApplicationConnection.addGetParameters(URIS[i], "a=b&c=d")); + SharedUtil.addGetParameters(URIS[i], "a=b&c=d")); // Fragments if (URIS_WITH_ABCD_PARAM_AND_FRAGMENT[i].length() > 0) { assertEquals( URIS_WITH_ABCD_PARAM_AND_FRAGMENT[i], - ApplicationConnection.addGetParameters(URIS[i] + SharedUtil.addGetParameters(URIS[i] + "#fragment", "a=b&c=d")); // Empty fragment assertEquals(URIS_WITH_ABCD_PARAM_AND_FRAGMENT[i].replace( "#fragment", "#"), - ApplicationConnection.addGetParameters(URIS[i] + "#", + SharedUtil.addGetParameters(URIS[i] + "#", "a=b&c=d")); } } |