Merge remote-tracking branch 'origin/7.0'

Change-Id: Ifdc095169c31731cb013727f14d92839ecc775db

2 files changed, 46 insertions, 0 deletions

diff --git a/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java b/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java
index 0d3dea28ac..3172b759a1 100644
--- a/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java
+++ b/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java
@@ -48,6 +48,11 @@ public class TestClassesSerializable extends TestCase {
             "com\\.vaadin\\.server\\.AbstractCommunicationManager.*", //
             "com\\.vaadin\\.server\\.CommunicationManager.*", //
             "com\\.vaadin\\.server\\.PortletCommunicationManager.*", //
+            "com\\.vaadin\\.buildhelpers.*", //
+            "com\\.vaadin\\.util\\.ReflectTools.*", //
+            "com\\.vaadin\\.data\\.util\\.ReflectTools.*", //
+            "com\\.vaadin\\.sass.*", //
+            "com\\.vaadin\\.util\\.CurrentInstance\\$1", //
     };
 
     /**
diff --git a/server/tests/src/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java b/server/tests/src/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java
new file mode 100644
index 0000000000..68c1133dc0
--- /dev/null
+++ b/server/tests/src/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java
@@ -0,0 +1,41 @@
+package com.vaadin.tests.server.component.fieldgroup;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import com.vaadin.data.fieldgroup.BeanFieldGroup;
+
+public class BeanFieldGroupTest {
+
+    public static class MyBean {
+
+        private MyNestedBean nestedBean = new MyNestedBean();
+
+        public MyNestedBean getNestedBean() {
+            return nestedBean;
+        }
+    }
+
+    public static class MyNestedBean {
+
+        private String hello = "Hello world";
+
+        public String getHello() {
+            return hello;
+        }
+    }
+
+    @Test
+    public void buildAndBindNestedProperty() {
+
+        MyBean bean = new MyBean();
+
+        BeanFieldGroup<MyBean> bfg = new BeanFieldGroup<MyBean>(MyBean.class);
+        bfg.setItemDataSource(bean);
+
+        com.vaadin.ui.Field<?> helloField = bfg.buildAndBind("Hello string",
+                "nestedBean.hello");
+        assertEquals(bean.nestedBean.hello, helloField.getValue().toString());
+    }
+
+}