Updated test to catch correct exception (#9147)

The test now fails before the query can be executed when the query string is generated.

svn changeset:24061/svn branch:6.8

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 657f06ae5ea9157583d2f105a813f55e485be3f8..e13589401328bc3110647079d91fd1ab92c6adaf 100644 (file)
--- 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();