Merge branch 'master' into html5-doctype

2 files changed, 136 insertions, 8 deletions

diff --git a/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java b/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java
index a78c76cb70..f97c2fdeb5 100644
--- a/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java
+++ b/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java
@@ -73,7 +73,7 @@ public class NavigatorTest extends TestCase {
 
     public static class TestNavigator extends Navigator {
         public TestNavigator() {
-            super(new NullFragmentManager(), new TestDisplay());
+            super(null, new NullFragmentManager(), new TestDisplay());
         }
 
         public View getView(String viewAndParameters) {
@@ -221,7 +221,7 @@ public class NavigatorTest extends TestCase {
         control.replay();
 
         // create and test navigator
-        Navigator navigator = new Navigator(manager, display);
+        Navigator navigator = new Navigator(null, manager, display);
         navigator.addProvider(provider);
 
         navigator.navigateTo("test1");
@@ -264,7 +264,7 @@ public class NavigatorTest extends TestCase {
         control.replay();
 
         // create and test navigator
-        Navigator navigator = new Navigator(manager, display);
+        Navigator navigator = new Navigator(null, manager, display);
         navigator.addProvider(provider);
 
         navigator.navigateTo("test2");
@@ -283,7 +283,7 @@ public class NavigatorTest extends TestCase {
         ViewChangeTestListener listener = new ViewChangeTestListener();
 
         // create navigator to test
-        Navigator navigator = new Navigator(manager, display);
+        Navigator navigator = new Navigator(null, manager, display);
 
         // prepare mocks: what to expect
         EasyMock.expect(provider.getViewName("test1")).andReturn("test1");
@@ -333,7 +333,7 @@ public class NavigatorTest extends TestCase {
         ViewChangeTestListener listener1 = new ViewChangeTestListener();
         ViewChangeTestListener listener2 = new ViewChangeTestListener();
 
-        Navigator navigator = new Navigator(manager, display);
+        Navigator navigator = new Navigator(null, manager, display);
 
         // prepare mocks: what to expect
         // first listener blocks first view change
@@ -467,7 +467,7 @@ public class NavigatorTest extends TestCase {
     }
 
     public void testAddViewWithNullName() throws Exception {
-        Navigator navigator = new Navigator(new NullFragmentManager(),
+        Navigator navigator = new Navigator(null, new NullFragmentManager(),
                 new NullDisplay());
 
         try {
@@ -483,7 +483,7 @@ public class NavigatorTest extends TestCase {
     }
 
     public void testAddViewWithNullInstance() throws Exception {
-        Navigator navigator = new Navigator(new NullFragmentManager(),
+        Navigator navigator = new Navigator(null, new NullFragmentManager(),
                 new NullDisplay());
 
         try {
@@ -494,7 +494,7 @@ public class NavigatorTest extends TestCase {
     }
 
     public void testAddViewWithNullClass() throws Exception {
-        Navigator navigator = new Navigator(new NullFragmentManager(),
+        Navigator navigator = new Navigator(null, new NullFragmentManager(),
                 new NullDisplay());
 
         try {
diff --git a/server/tests/src/com/vaadin/ui/LabelDataSource.java b/server/tests/src/com/vaadin/ui/LabelDataSource.java
new file mode 100644
index 0000000000..3abe12535b
--- /dev/null
+++ b/server/tests/src/com/vaadin/ui/LabelDataSource.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2011 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.ui;
+
+import java.util.Locale;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.server.VaadinSession;
+import com.vaadin.server.WrappedRequest;
+
+public class LabelDataSource {
+
+    Label label;
+    private static final String STRING_DS_VALUE = "String DatA source";
+    private static final int INTEGER_DS_VALUE = 1587;
+    private static final String INTEGER_STRING_VALUE_FI = "1 587";
+    private static final String INTEGER_STRING_VALUE_EN_US = "1,587";
+    private static final Object INTEGER_STRING_VALUE_DE = "1.587";
+    ObjectProperty<String> stringDataSource;
+    private ObjectProperty<Integer> integerDataSource;
+    VaadinSession vaadinSession;
+
+    @Before
+    public void setup() {
+        vaadinSession = new VaadinSession();
+        VaadinSession.setCurrent(vaadinSession);
+
+        label = new Label();
+        stringDataSource = new ObjectProperty<String>(STRING_DS_VALUE);
+        integerDataSource = new ObjectProperty<Integer>(INTEGER_DS_VALUE);
+    }
+
+    @Test
+    public void stringDataSource() {
+        label.setPropertyDataSource(stringDataSource);
+        Assert.assertEquals(STRING_DS_VALUE, label.getState().text);
+        Assert.assertEquals(STRING_DS_VALUE, label.getValue());
+        Assert.assertEquals(stringDataSource, label.getPropertyDataSource());
+        label.setPropertyDataSource(null);
+        Assert.assertEquals(STRING_DS_VALUE, label.getState().text);
+        Assert.assertEquals(STRING_DS_VALUE, label.getValue());
+        Assert.assertEquals(null, label.getPropertyDataSource());
+        label.setValue("foo");
+        Assert.assertEquals("foo", label.getState().text);
+        Assert.assertEquals("foo", label.getValue());
+        Assert.assertNull(label.getPropertyDataSource());
+
+    }
+
+    @Test
+    public void integerDataSourceFi() {
+        label.setLocale(new Locale("fi", "FI"));
+        label.setPropertyDataSource(integerDataSource);
+        Assert.assertEquals(INTEGER_STRING_VALUE_FI, label.getState().text);
+        Assert.assertEquals(INTEGER_STRING_VALUE_FI, label.getValue());
+        Assert.assertEquals(integerDataSource, label.getPropertyDataSource());
+    }
+
+    @Test
+    public void integerDataSourceEn() {
+        label.setLocale(new Locale("en", "US"));
+        label.setPropertyDataSource(integerDataSource);
+        Assert.assertEquals(INTEGER_STRING_VALUE_EN_US, label.getState().text);
+        Assert.assertEquals(INTEGER_STRING_VALUE_EN_US, label.getValue());
+        Assert.assertEquals(integerDataSource, label.getPropertyDataSource());
+    }
+
+    @Test
+    public void changeLocaleAfterDataSource() {
+        label.setLocale(new Locale("en", "US"));
+        label.setPropertyDataSource(integerDataSource);
+        label.setLocale(new Locale("fi", "FI"));
+        Assert.assertEquals(INTEGER_STRING_VALUE_FI, label.getState().text);
+        Assert.assertEquals(INTEGER_STRING_VALUE_FI, label.getValue());
+        Assert.assertEquals(integerDataSource, label.getPropertyDataSource());
+    }
+
+    @Test
+    public void setRemoveDataSource() {
+        label.setValue("before");
+        label.setPropertyDataSource(stringDataSource);
+        Assert.assertEquals(STRING_DS_VALUE, label.getValue());
+        label.setPropertyDataSource(null);
+        Assert.assertEquals(STRING_DS_VALUE, label.getValue());
+        label.setValue("after");
+        Assert.assertEquals("after", label.getValue());
+    }
+
+    public class MockUI extends UI {
+
+        public MockUI() {
+            setSession(vaadinSession);
+        }
+
+        @Override
+        protected void init(WrappedRequest request) {
+        }
+
+    }
+
+    @Test
+    public void attachToSessionWithDifferentLocale() {
+        label.setValue("before");
+        // label.setLocale(Locale.GERMANY);
+        label.setPropertyDataSource(integerDataSource);
+        UI ui = new MockUI();
+        ui.setLocale(Locale.GERMANY);
+        ui.addComponent(label);
+        Assert.assertEquals(INTEGER_STRING_VALUE_DE, label.getState().text);
+    }
+}