diff options
| author | Leif Åstrand <leif@vaadin.com> | 2015-01-10 22:19:36 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2015-01-12 14:25:23 +0000 |
| commit | e20f6fd54ae4b350ea654807b98fe442e546d1a8 (patch) | |
| tree | 1c0ac2492469c7dba4b7a2ce5dde216d989316af /client/tests/src | |
| parent | 2bc4f17916e919d7b92dcf03877c7bf2ff0f51c8 (diff) | |
| download | vaadin-framework-e20f6fd54ae4b350ea654807b98fe442e546d1a8.tar.gz vaadin-framework-e20f6fd54ae4b350ea654807b98fe442e546d1a8.zip | |
Include UI class @JavaScript and @StyleSheet in bootstrap html (#9045)
Change-Id: I9d4243fa6f91ba5bc3449d0a3ec24f209e6360e6
Diffstat (limited to 'client/tests/src')
| -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")); } } |