Merged 6.8 branch

2 files changed, 111 insertions, 28 deletions

diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java
index b9621d518a..09f620cc2a 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java
+++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java
@@ -4,46 +4,48 @@ import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.ArrayList;
 import java.util.Arrays;
 
-import com.vaadin.data.Property.ReadOnlyException;
-import com.vaadin.data.util.sqlcontainer.ColumnProperty.NotNullableException;
-import com.vaadin.data.util.sqlcontainer.query.QueryDelegate;
-
 import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.data.Property.ReadOnlyException;
+import com.vaadin.data.util.sqlcontainer.ColumnProperty.NotNullableException;
+import com.vaadin.data.util.sqlcontainer.query.QueryDelegate;
+
 public class ColumnPropertyTest {
 
     @Test
     public void constructor_legalParameters_shouldSucceed() {
         ColumnProperty cp = new ColumnProperty("NAME", false, true, true,
-                "Ville", String.class);
+                false, "Ville", String.class);
         Assert.assertNotNull(cp);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void constructor_missingPropertyId_shouldFail() {
-        new ColumnProperty(null, false, true, true, "Ville", String.class);
+        new ColumnProperty(null, false, true, true, false, "Ville",
+                String.class);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void constructor_missingType_shouldFail() {
-        new ColumnProperty("NAME", false, true, true, "Ville", null);
+        new ColumnProperty("NAME", false, true, true, false, "Ville", null);
     }
 
     @Test
     public void getValue_defaultValue_returnsVille() {
         ColumnProperty cp = new ColumnProperty("NAME", false, true, true,
-                "Ville", String.class);
+                false, "Ville", String.class);
         Assert.assertEquals("Ville", cp.getValue());
     }
 
     @Test
     public void setValue_readWriteNullable_returnsKalle() {
         ColumnProperty cp = new ColumnProperty("NAME", false, true, true,
-                "Ville", String.class);
+                false, "Ville", String.class);
         SQLContainer container = EasyMock.createMock(SQLContainer.class);
         RowItem owner = new RowItem(container, new RowId(new Object[] { 1 }),
                 Arrays.asList(cp));
@@ -57,7 +59,7 @@ public class ColumnPropertyTest {
     @Test(expected = ReadOnlyException.class)
     public void setValue_readOnlyNullable_shouldFail() {
         ColumnProperty cp = new ColumnProperty("NAME", true, true, true,
-                "Ville", String.class);
+                false, "Ville", String.class);
         SQLContainer container = EasyMock.createMock(SQLContainer.class);
         new RowItem(container, new RowId(new Object[] { 1 }), Arrays.asList(cp));
         EasyMock.replay(container);
@@ -68,7 +70,7 @@ public class ColumnPropertyTest {
     @Test
     public void setValue_readWriteNullable_nullShouldWork() {
         ColumnProperty cp = new ColumnProperty("NAME", false, true, true,
-                "Ville", String.class);
+                false, "Ville", String.class);
         SQLContainer container = EasyMock.createMock(SQLContainer.class);
         RowItem owner = new RowItem(container, new RowId(new Object[] { 1 }),
                 Arrays.asList(cp));
@@ -82,7 +84,7 @@ public class ColumnPropertyTest {
     @Test(expected = NotNullableException.class)
     public void setValue_readWriteNotNullable_nullShouldFail() {
         ColumnProperty cp = new ColumnProperty("NAME", false, true, false,
-                "Ville", String.class);
+                false, "Ville", String.class);
         SQLContainer container = EasyMock.createMock(SQLContainer.class);
         RowItem owner = new RowItem(container, new RowId(new Object[] { 1 }),
                 Arrays.asList(cp));
@@ -96,28 +98,28 @@ public class ColumnPropertyTest {
     @Test
     public void getType_normal_returnsStringClass() {
         ColumnProperty cp = new ColumnProperty("NAME", false, true, true,
-                "Ville", String.class);
+                false, "Ville", String.class);
         Assert.assertSame(String.class, cp.getType());
     }
 
     @Test
     public void isReadOnly_readWriteNullable_returnsTrue() {
         ColumnProperty cp = new ColumnProperty("NAME", false, true, true,
-                "Ville", String.class);
+                false, "Ville", String.class);
         Assert.assertFalse(cp.isReadOnly());
     }
 
     @Test
     public void isReadOnly_readOnlyNullable_returnsTrue() {
         ColumnProperty cp = new ColumnProperty("NAME", true, true, true,
-                "Ville", String.class);
+                false, "Ville", String.class);
         Assert.assertTrue(cp.isReadOnly());
     }
 
     @Test
     public void setReadOnly_readOnlyChangeAllowed_shouldSucceed() {
         ColumnProperty cp = new ColumnProperty("NAME", false, true, true,
-                "Ville", String.class);
+                false, "Ville", String.class);
         cp.setReadOnly(true);
         Assert.assertTrue(cp.isReadOnly());
     }
@@ -125,7 +127,7 @@ public class ColumnPropertyTest {
     @Test
     public void setReadOnly_readOnlyChangeDisallowed_shouldFail() {
         ColumnProperty cp = new ColumnProperty("NAME", false, false, true,
-                "Ville", String.class);
+                false, "Ville", String.class);
         cp.setReadOnly(true);
         Assert.assertFalse(cp.isReadOnly());
     }
@@ -133,14 +135,14 @@ public class ColumnPropertyTest {
     @Test
     public void getPropertyId_normal_returnsNAME() {
         ColumnProperty cp = new ColumnProperty("NAME", false, false, true,
-                "Ville", String.class);
+                false, "Ville", String.class);
         Assert.assertEquals("NAME", cp.getPropertyId());
     }
 
     @Test
     public void isModified_valueModified_returnsTrue() {
         ColumnProperty cp = new ColumnProperty("NAME", false, true, true,
-                "Ville", String.class);
+                false, "Ville", String.class);
         SQLContainer container = EasyMock.createMock(SQLContainer.class);
         RowItem owner = new RowItem(container, new RowId(new Object[] { 1 }),
                 Arrays.asList(cp));
@@ -155,14 +157,14 @@ public class ColumnPropertyTest {
     @Test
     public void isModified_valueNotModified_returnsFalse() {
         ColumnProperty cp = new ColumnProperty("NAME", false, false, true,
-                "Ville", String.class);
+                false, "Ville", String.class);
         Assert.assertFalse(cp.isModified());
     }
 
     @Test
     public void setValue_nullOnNullable_shouldWork() {
         ColumnProperty cp = new ColumnProperty("NAME", false, true, true,
-                "asdf", String.class);
+                false, "asdf", String.class);
         SQLContainer container = EasyMock.createMock(SQLContainer.class);
         new RowItem(container, new RowId(new Object[] { 1 }), Arrays.asList(cp));
         cp.setValue(null);
@@ -171,8 +173,8 @@ public class ColumnPropertyTest {
 
     @Test
     public void setValue_resetTonullOnNullable_shouldWork() {
-        ColumnProperty cp = new ColumnProperty("NAME", false, true, true, null,
-                String.class);
+        ColumnProperty cp = new ColumnProperty("NAME", false, true, true, false,
+                null, String.class);
         SQLContainer container = EasyMock.createMock(SQLContainer.class);
         new RowItem(container, new RowId(new Object[] { 1 }), Arrays.asList(cp));
         cp.setValue("asdf");
@@ -202,7 +204,7 @@ public class ColumnPropertyTest {
         }
 
         ColumnProperty property = new ColumnProperty("NAME", false, true, true,
-                "Ville", String.class);
+                false, "Ville", String.class);
 
         Statement statement = EasyMock.createNiceMock(Statement.class);
         EasyMock.replay(statement);
@@ -229,4 +231,85 @@ public class ColumnPropertyTest {
         Assert.assertEquals("Kalle", container.value);
         Assert.assertTrue(container.modified);
     }
+
+    @Test
+    public void versionColumnsShouldNotBeInValueMap_shouldReturnFalse() {
+        ColumnProperty property = new ColumnProperty("NAME", false, true, true,
+                false, "Ville", String.class);
+        property.setVersionColumn(true);
+
+        Assert.assertFalse(property.isPersistent());
+    }
+
+    @Test
+    public void neverWritableColumnsShouldNotBeInValueMap_shouldReturnFalse() {
+        ColumnProperty property = new ColumnProperty("NAME", true, false, true,
+                false, "Ville", String.class);
+
+        Assert.assertFalse(property.isPersistent());
+    }
+
+    @Test
+    public void writableColumnsShouldBeInValueMap_shouldReturnTrue() {
+        ColumnProperty property = new ColumnProperty("NAME", false, true, true,
+                false, "Ville", String.class);
+
+        Assert.assertTrue(property.isPersistent());
+    }
+
+    @Test
+    public void writableButReadOnlyColumnsShouldNotBeInValueMap_shouldReturnFalse() {
+        ColumnProperty property = new ColumnProperty("NAME", true, true, true,
+                false, "Ville", String.class);
+
+        Assert.assertFalse(property.isPersistent());
+    }
+
+    @Test
+    public void primKeysShouldBeRowIdentifiers_shouldReturnTrue() {
+        ColumnProperty property = new ColumnProperty("NAME", false, true, true,
+                true, "Ville", String.class);
+
+        Assert.assertTrue(property.isRowIdentifier());
+    }
+
+    @Test
+    public void versionColumnsShouldBeRowIdentifiers_shouldReturnTrue() {
+        ColumnProperty property = new ColumnProperty("NAME", false, true, true,
+                false, "Ville", String.class);
+        property.setVersionColumn(true);
+
+        Assert.assertTrue(property.isRowIdentifier());
+    }
+
+    @Test
+    public void nonPrimKeyOrVersionColumnsShouldBeNotRowIdentifiers_shouldReturnFalse() {
+        ColumnProperty property = new ColumnProperty("NAME", false, true, true,
+                false, "Ville", String.class);
+
+        Assert.assertFalse(property.isRowIdentifier());
+    }
+
+    @Test
+    public void getOldValueShouldReturnPreviousValue_shouldReturnVille() {
+        ColumnProperty property = new ColumnProperty("NAME", false, true, true,
+                false, "Ville", String.class);
+
+        // Here we really don't care about the container management, but in
+        // order to set the value for a column the owner (RowItem) must be set
+        // and to create the owner we must have a container...
+        ArrayList<ColumnProperty> properties = new ArrayList<ColumnProperty>();
+        properties.add(property);
+
+        SQLContainer container = EasyMock.createNiceMock(SQLContainer.class);
+        RowItem rowItem = new RowItem(container, new RowId(new Object[] { 1 }),
+                Arrays.asList(property));
+
+        property.setValue("Kalle");
+        // Just check that the new value was actually set...
+        Assert.assertEquals("Kalle", property.getValue());
+        // Assert that old value is the original value...
+        Assert.assertEquals("Ville", property.getOldValue());
+    }
+
 }
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java
index 657f06ae5e..e135894013 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java
+++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java
@@ -18,15 +18,13 @@ import com.vaadin.data.Container.Filter;
 import com.vaadin.data.util.filter.Compare.Equal;
 import com.vaadin.data.util.filter.Like;
 import com.vaadin.data.util.sqlcontainer.AllTests;
+import com.vaadin.data.util.sqlcontainer.AllTests.DB;
 import com.vaadin.data.util.sqlcontainer.DataGenerator;
 import com.vaadin.data.util.sqlcontainer.OptimisticLockException;
 import com.vaadin.data.util.sqlcontainer.RowItem;
 import com.vaadin.data.util.sqlcontainer.SQLContainer;
-import com.vaadin.data.util.sqlcontainer.AllTests.DB;
 import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
 import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.query.OrderBy;
-import com.vaadin.data.util.sqlcontainer.query.TableQuery;
 import com.vaadin.data.util.sqlcontainer.query.generator.DefaultSQLGenerator;
 
 public class TableQueryTest {
@@ -281,7 +279,9 @@ public class TableQueryTest {
                 AllTests.sqlGen);
         try {
             tQuery.containsRowWithKey(new Object[] { null });
-        } catch (SQLException e) {
+            org.junit.Assert
+                    .fail("null should throw an IllegalArgumentException from StatementHelper");
+        } catch (IllegalArgumentException e) {
             // We should now be able to reserve two connections
             connectionPool.reserveConnection();
             connectionPool.reserveConnection();