diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-01-12 11:28:55 +0200 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-01-12 11:28:55 +0200 |
| commit | 2286f9871f7f77dea6139d0cd1dfc6754b1946d5 (patch) | |
| tree | c8a978d77dff74788b5a290f6c7928e39932b8a5 /client/tests/src/com/vaadin | |
| parent | 35d91245de3218283c8f4c733a3aa72ea395fb1c (diff) | |
| parent | 3f27e02f121c0a39b217532afcf9530bfd2caba7 (diff) | |
| download | vaadin-framework-2286f9871f7f77dea6139d0cd1dfc6754b1946d5.tar.gz vaadin-framework-2286f9871f7f77dea6139d0cd1dfc6754b1946d5.zip | |
Merge remote-tracking branch 'origin/master' into grid
Change-Id: Ic6b667ea6ceff43a609ce2037f656c6274871fb7
Diffstat (limited to 'client/tests/src/com/vaadin')
| -rw-r--r-- | client/tests/src/com/vaadin/client/ApplicationConnectionURLGenerationTest.java (renamed from client/tests/src/com/vaadin/client/ApplicationConnectionTestURLGeneration.java) | 2 | ||||
| -rw-r--r-- | client/tests/src/com/vaadin/client/VBrowserDetailsUserAgentParserTest.java (renamed from client/tests/src/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/client/tests/src/com/vaadin/client/ApplicationConnectionTestURLGeneration.java b/client/tests/src/com/vaadin/client/ApplicationConnectionURLGenerationTest.java index cb4f1f4068..36baa163cb 100644 --- a/client/tests/src/com/vaadin/client/ApplicationConnectionTestURLGeneration.java +++ b/client/tests/src/com/vaadin/client/ApplicationConnectionURLGenerationTest.java @@ -4,7 +4,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -public class ApplicationConnectionTestURLGeneration { +public class ApplicationConnectionURLGenerationTest { private static final String[] URIS = new String[] { "http://demo.vaadin.com/", // diff --git a/client/tests/src/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java b/client/tests/src/com/vaadin/client/VBrowserDetailsUserAgentParserTest.java index cb70fc7a39..62b727e5f5 100644 --- a/client/tests/src/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java +++ b/client/tests/src/com/vaadin/client/VBrowserDetailsUserAgentParserTest.java @@ -6,7 +6,7 @@ import org.junit.Assert; import com.vaadin.shared.VBrowserDetails; -public class TestVBrowserDetailsUserAgentParser extends TestCase { +public class VBrowserDetailsUserAgentParserTest extends TestCase { private static final String FIREFOX30_WINDOWS = "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-GB; rv:1.9.0.6) Gecko/2009011913 Firefox/3.0.6"; private static final String FIREFOX30_LINUX = "Mozilla/5.0 (X11; U; Linux x86_64; es-ES; rv:1.9.0.12) Gecko/2009070811 Ubuntu/9.04 (jaunty) Firefox/3.0.12"; |