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 /server/tests/src/com/vaadin/ui | |
| 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 'server/tests/src/com/vaadin/ui')
| -rw-r--r-- | server/tests/src/com/vaadin/ui/AbsFieldDataSourceLocaleChangeTest.java (renamed from server/tests/src/com/vaadin/ui/AbsFieldDataSourceLocaleChange.java) | 2 | ||||
| -rw-r--r-- | server/tests/src/com/vaadin/ui/AbsSelectTest.java (renamed from server/tests/src/com/vaadin/ui/AbstractSelectTest.java) | 2 | ||||
| -rw-r--r-- | server/tests/src/com/vaadin/ui/LabelDataSourceTest.java (renamed from server/tests/src/com/vaadin/ui/LabelDataSource.java) | 2 | ||||
| -rw-r--r-- | server/tests/src/com/vaadin/ui/UIThemeEscapingTest.java (renamed from server/tests/src/com/vaadin/ui/UIThemeEscaping.java) | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/server/tests/src/com/vaadin/ui/AbsFieldDataSourceLocaleChange.java b/server/tests/src/com/vaadin/ui/AbsFieldDataSourceLocaleChangeTest.java index fa69fc46da..bb5babf360 100644 --- a/server/tests/src/com/vaadin/ui/AbsFieldDataSourceLocaleChange.java +++ b/server/tests/src/com/vaadin/ui/AbsFieldDataSourceLocaleChangeTest.java @@ -12,7 +12,7 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinSession; import com.vaadin.tests.util.AlwaysLockedVaadinSession; -public class AbsFieldDataSourceLocaleChange { +public class AbsFieldDataSourceLocaleChangeTest { private VaadinSession vaadinSession; private UI ui; diff --git a/server/tests/src/com/vaadin/ui/AbstractSelectTest.java b/server/tests/src/com/vaadin/ui/AbsSelectTest.java index bd399f088c..0b807c5f21 100644 --- a/server/tests/src/com/vaadin/ui/AbstractSelectTest.java +++ b/server/tests/src/com/vaadin/ui/AbsSelectTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import com.vaadin.data.util.ObjectProperty; -public class AbstractSelectTest { +public class AbsSelectTest { @Test public void addItemsStrings() { diff --git a/server/tests/src/com/vaadin/ui/LabelDataSource.java b/server/tests/src/com/vaadin/ui/LabelDataSourceTest.java index b57e83df8e..8ec3ca1245 100644 --- a/server/tests/src/com/vaadin/ui/LabelDataSource.java +++ b/server/tests/src/com/vaadin/ui/LabelDataSourceTest.java @@ -26,7 +26,7 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinSession; import com.vaadin.tests.util.AlwaysLockedVaadinSession; -public class LabelDataSource { +public class LabelDataSourceTest { Label label; private static final String STRING_DS_VALUE = "String DatA source"; diff --git a/server/tests/src/com/vaadin/ui/UIThemeEscaping.java b/server/tests/src/com/vaadin/ui/UIThemeEscapingTest.java index 236f283823..7a0a5551e3 100644 --- a/server/tests/src/com/vaadin/ui/UIThemeEscaping.java +++ b/server/tests/src/com/vaadin/ui/UIThemeEscapingTest.java @@ -25,7 +25,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class UIThemeEscaping { +public class UIThemeEscapingTest { private UI ui; |