1 files changed, 2 insertions, 11 deletions
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java
index 92d0c49205..b2cc9a5d0c 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java
@@ -99,23 +99,14 @@ public class SQLContainerTableQueryTest {
         assertTrue(container.removeItem(container.lastItemId()));
     }
 
-    @Test
+    @Test(expected = SQLException.class)
     public void itemWithNonExistingVersionColumnCannotBeRemoved()
             throws SQLException {
         query.setVersionColumn("version");
 
         container.removeItem(container.lastItemId());
 
-        // FIXME Remove try-catch when https://dev.vaadin.com/ticket/17858 is
-        // fixed
-        try {
-            container.commit();
-            Assert.fail("Commit should not succeed when version column does not exist");
-        } catch (IllegalArgumentException e) {
-            // This should not be here at all as commit() should not leave the
-            // transaction open!
-            container.getQueryDelegate().rollback();
-        }
+        container.commit();
     }
 
     @Test