Merge remote-tracking branch 'origin/6.8'

Conflicts:
	src/com/vaadin/terminal/gwt/client/ui/popupview/VPopupView.java
	tests/testbench/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java
	tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java

6 files changed, 419 insertions, 89 deletions

diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
index 66b5e23cda..1bc76fff1e 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
+++ b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
@@ -24,6 +24,8 @@ public abstract class AbstractFieldTest<T extends AbstractField<?>> extends
         AbstractComponentTest<T> implements ValueChangeListener,
         ReadOnlyStatusChangeListener {
 
+    private boolean sortValueChanges = true;
+
     @Override
     protected void createActions() {
         super.createActions();
@@ -73,6 +75,17 @@ public abstract class AbstractFieldTest<T extends AbstractField<?>> extends
                     }
                 }
             });
+
+            MenuItem sortValueChangesItem = abstractField.addItem(
+                    "Show sorted value changes", new MenuBar.Command() {
+                        public void menuSelected(MenuItem selectedItem) {
+                            sortValueChanges = selectedItem.isChecked();
+                            log("Show sorted value changes: "
+                                    + sortValueChanges);
+                        }
+                    });
+            sortValueChangesItem.setCheckable(true);
+            sortValueChangesItem.setChecked(true);
         }
     }
 
@@ -140,7 +153,7 @@ public abstract class AbstractFieldTest<T extends AbstractField<?>> extends
     @SuppressWarnings({ "rawtypes", "unchecked" })
     private String getValue(Property property) {
         Object o = property.getValue();
-        if (o instanceof Collection) {
+        if (o instanceof Collection && sortValueChanges) {
             // Sort collections to avoid problems with values printed in
             // different order
             try {
diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java
index 47c97bbc21..6461d10277 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java
+++ b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java
@@ -45,17 +45,19 @@ public class PopupViewClickShortcut extends TestBase {
         l.setCaption(caption);
         l.setWidth(null);
 
-        Button b = new Button("Submit " + caption, new Button.ClickListener() {
-            private int i = 5;
+        Button b = new Button("Submit " + caption + " (Ctrl+Alt+"
+                + String.valueOf(Character.toChars(keyCode)) + ")",
+                new Button.ClickListener() {
+                    private int i = 5;
 
-            @Override
-            public void buttonClick(ClickEvent event) {
-                log.log("Submitted from "
-                        + event.getButton().getParent().getCaption());
-                t.addItem(new String[] { "added " + i++ }, i);
-            }
-        });
-        b.setClickShortcut(keyCode, ModifierKey.ALT);
+                    @Override
+                    public void buttonClick(ClickEvent event) {
+                        log.log("Submitted from "
+                                + event.getButton().getParent().getCaption());
+                        t.addItem(new String[] { "added " + i++ }, i);
+                    }
+                });
+        b.setClickShortcut(keyCode, ModifierKey.CTRL, ModifierKey.ALT);
 
         l.addComponent(t);
         l.addComponent(b);
diff --git a/tests/testbench/com/vaadin/tests/components/table/MultiSelectValueOrder.html b/tests/testbench/com/vaadin/tests/components/table/MultiSelectValueOrder.html
new file mode 100644
index 0000000000..4bac7741da
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/table/MultiSelectValueOrder.html
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://localhost:8888/" />
+<title>New Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">New Test</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.table.Tables?restartApplication</td>
+	<td></td>
+</tr>
+<!--Default multi select-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>
+	<td>6,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item4</td>
+	<td>73,0</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>33,13</td>
+</tr>
+<!--ValueChangeListener-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>
+	<td>14,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>75,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item0</td>
+	<td>64,6</td>
+</tr>
+<!--Disable sorting value change logging-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item1</td>
+	<td>16,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item3</td>
+	<td>22,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item1</td>
+	<td>16,12</td>
+</tr>
+<!--Clear log to ensure numbers matches with the later case-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item1</td>
+	<td>29,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item1</td>
+	<td>40,7</td>
+</tr>
+<!--Start clicking-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[0]/domChild[0]</td>
+	<td>48,18</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td>
+	<td>0. ValueChangeEvent, new value: '[Item 5]'</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[1]/domChild[0]</td>
+	<td>40,12:ctrl</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td>
+	<td>1. ValueChangeEvent, new value: '[Item 5, Item 3]'</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[6]/domChild[1]/domChild[0]</td>
+	<td>54,15:ctrl</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td>
+	<td>2. ValueChangeEvent, new value: '[Item 5, Item 3, Item 7]'</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[8]/domChild[1]/domChild[0]</td>
+	<td>54,9:shift+ctrl</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td>
+	<td>3. ValueChangeEvent, new value: '[Item 5, Item 3, Item 7, Item 8, Item 9]'</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
+	<td>67,8:ctrl</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td>
+	<td>4. ValueChangeEvent, new value: '[Item 5, Item 3, Item 7, Item 8, Item 9, Item 1]'</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[2]/domChild[0]</td>
+	<td>71,8:shift+ctrl</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td>
+	<td>5. ValueChangeEvent, new value: '[Item 5, Item 3, Item 7, Item 8, Item 9, Item 1, Item 2, Item 4]'</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[2]/domChild[0]</td>
+	<td>56,6:ctrl</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td>
+	<td>6. ValueChangeEvent, new value: '[Item 3, Item 7, Item 8, Item 9, Item 1, Item 2, Item 4]'</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[2]/domChild[0]</td>
+	<td>67,11:ctrl</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td>
+	<td>7. ValueChangeEvent, new value: '[Item 3, Item 7, Item 8, Item 9, Item 1, Item 2, Item 4, Item 5]'</td>
+</tr>
+<!--Simple multi select-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>
+	<td>33,9</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item4</td>
+	<td>44,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>40,11</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item2</td>
+	<td>58,8</td>
+</tr>
+<!--Clear value-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>
+	<td>38,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item4</td>
+	<td>14,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item3</td>
+	<td>55,3</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item0</td>
+	<td>21,3</td>
+</tr>
+<!--Clear log-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item1</td>
+	<td>26,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item1</td>
+	<td>30,6</td>
+</tr>
+<!--Start clicking-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[1]/domChild[0]</td>
+	<td>60,9</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td>
+	<td>0. ValueChangeEvent, new value: '[Item 5]'</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[1]/domChild[0]</td>
+	<td>38,9</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td>
+	<td>1. ValueChangeEvent, new value: '[Item 5, Item 3]'</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[1]/domChild[0]</td>
+	<td>46,13</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td>
+	<td>2. ValueChangeEvent, new value: '[Item 5, Item 3, Item 4]'</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[1]/domChild[0]</td>
+	<td>65,8</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td>
+	<td>3. ValueChangeEvent, new value: '[Item 5, Item 4]'</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[2]/domChild[0]</td>
+	<td>45,7</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td>
+	<td>4. ValueChangeEvent, new value: '[Item 4]'</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[2]/domChild[0]</td>
+	<td>35,9</td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td>
+	<td>5. ValueChangeEvent, new value: '[Item 4, Item 5]'</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
index a5a8f7d24b..f34c12607a 100644
--- a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
+++ b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
@@ -1,8 +1,6 @@
 package com.vaadin.tests.containers.sqlcontainer;
 
-import java.sql.Connection;
 import java.sql.SQLException;
-import java.sql.Statement;
 
 import com.vaadin.Application;
 import com.vaadin.data.Container.ItemSetChangeEvent;
@@ -10,11 +8,6 @@ import com.vaadin.data.Container.ItemSetChangeListener;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.util.sqlcontainer.AllTests;
-import com.vaadin.data.util.sqlcontainer.SQLContainer;
-import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.query.TableQuery;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Form;
@@ -118,75 +111,4 @@ public class CheckboxUpdateProblem extends Application.LegacyApplication
 
     }
 
-    private class DatabaseHelper {
-
-        private JDBCConnectionPool connectionPool = null;
-        private SQLContainer testContainer = null;
-        private static final String TABLENAME = "testtable";
-
-        public DatabaseHelper() {
-            initConnectionPool();
-            initDatabase();
-            initContainers();
-        }
-
-        private void initDatabase() {
-            try {
-                Connection conn = connectionPool.reserveConnection();
-                Statement statement = conn.createStatement();
-                try {
-                    statement.execute("drop table " + TABLENAME);
-                } catch (SQLException e) {
-                    // Will fail if table doesn't exist, which is OK.
-                    conn.rollback();
-                }
-                switch (AllTests.db) {
-                case MYSQL:
-                    statement
-                            .execute("create table "
-                                    + TABLENAME
-                                    + " (id integer auto_increment not null, field1 varchar(100), field2 boolean, primary key(id))");
-                    break;
-                case POSTGRESQL:
-                    statement
-                            .execute("create table "
-                                    + TABLENAME
-                                    + " (\"id\" serial primary key, \"field1\" varchar(100), \"field2\" boolean)");
-                    break;
-                }
-                statement.executeUpdate("insert into " + TABLENAME
-                        + " values(default, 'Kalle', 'true')");
-                statement.close();
-                conn.commit();
-                connectionPool.releaseConnection(conn);
-            } catch (SQLException e) {
-                e.printStackTrace();
-            }
-        }
-
-        private void initContainers() {
-            try {
-                TableQuery q1 = new TableQuery(TABLENAME, connectionPool);
-                q1.setVersionColumn("id");
-                testContainer = new SQLContainer(q1);
-            } catch (SQLException e) {
-                e.printStackTrace();
-            }
-        }
-
-        private void initConnectionPool() {
-            try {
-                connectionPool = new SimpleJDBCConnectionPool(
-                        AllTests.dbDriver, AllTests.dbURL, AllTests.dbUser,
-                        AllTests.dbPwd, 2, 5);
-            } catch (SQLException e) {
-                e.printStackTrace();
-            }
-        }
-
-        public SQLContainer getTestContainer() {
-            return testContainer;
-        }
-    }
-
 }
diff --git a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java
new file mode 100644
index 0000000000..b7d1b8c37e
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java
@@ -0,0 +1,27 @@
+package com.vaadin.tests.containers.sqlcontainer;
+
+import com.vaadin.Application;
+import com.vaadin.ui.AbstractSelect.Filtering;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.Root;
+
+/**
+ * See http://dev.vaadin.com/ticket/9155 .
+ */
+public class ComboBoxUpdateProblem extends Application.LegacyApplication {
+    private final DatabaseHelper databaseHelper = new DatabaseHelper();
+
+    @Override
+    public void init() {
+        setMainWindow(new Root.LegacyWindow("Test window"));
+
+        ComboBox combo = new ComboBox("Names",
+                databaseHelper.getTestContainer());
+        combo.setItemCaptionPropertyId("FIELD1");
+        combo.setFilteringMode(Filtering.FILTERINGMODE_CONTAINS);
+        combo.setImmediate(true);
+
+        getMainWindow().addComponent(combo);
+    }
+
+}
\ No newline at end of file
diff --git a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java
new file mode 100644
index 0000000000..b7b1e74eb0
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java
@@ -0,0 +1,91 @@
+package com.vaadin.tests.containers.sqlcontainer;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import com.vaadin.data.util.sqlcontainer.AllTests;
+import com.vaadin.data.util.sqlcontainer.SQLContainer;
+import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
+import com.vaadin.data.util.sqlcontainer.query.TableQuery;
+
+class DatabaseHelper {
+
+    private JDBCConnectionPool connectionPool = null;
+    private SQLContainer testContainer = null;
+    private static final String TABLENAME = "testtable";
+
+    public DatabaseHelper() {
+        initConnectionPool();
+        initDatabase();
+        initContainers();
+    }
+
+    private void initDatabase() {
+        try {
+            Connection conn = connectionPool.reserveConnection();
+            Statement statement = conn.createStatement();
+            try {
+                statement.execute("drop table " + TABLENAME);
+            } catch (SQLException e) {
+                // Will fail if table doesn't exist, which is OK.
+                conn.rollback();
+            }
+            switch (AllTests.db) {
+            case HSQLDB:
+                statement
+                        .execute("create table "
+                                + TABLENAME
+                                + " (id integer GENERATED BY DEFAULT AS IDENTITY, field1 varchar(100), field2 boolean, primary key(id))");
+                break;
+            case MYSQL:
+                statement
+                        .execute("create table "
+                                + TABLENAME
+                                + " (id integer auto_increment not null, field1 varchar(100), field2 boolean, primary key(id))");
+                break;
+            case POSTGRESQL:
+                statement
+                        .execute("create table "
+                                + TABLENAME
+                                + " (\"id\" serial primary key, \"field1\" varchar(100), \"field2\" boolean)");
+                break;
+            }
+            statement.executeUpdate("insert into " + TABLENAME
+                    + " values(default, 'Kalle', 'true')");
+            statement.executeUpdate("insert into " + TABLENAME
+                    + " values(default, 'Ville', 'true')");
+            statement.executeUpdate("insert into " + TABLENAME
+                    + " values(default, 'Jussi', 'true')");
+            statement.close();
+            conn.commit();
+            connectionPool.releaseConnection(conn);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void initContainers() {
+        try {
+            TableQuery q1 = new TableQuery(TABLENAME, connectionPool);
+            q1.setVersionColumn("id");
+            testContainer = new SQLContainer(q1);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void initConnectionPool() {
+        try {
+            connectionPool = new SimpleJDBCConnectionPool(AllTests.dbDriver,
+                    AllTests.dbURL, AllTests.dbUser, AllTests.dbPwd, 2, 5);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public SQLContainer getTestContainer() {
+        return testContainer;
+    }
+}
\ No newline at end of file