From: Artur Signell <artur.signell@itmill.com>
Date: Fri, 3 Aug 2012 13:54:23 +0000 (+0000)
Subject: Updated test to catch correct exception (#9147)
X-Git-Tag: 7.0.0.beta1~79^2~43
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=00806654f5015e18c41ce1a8002f58d63a7d951c;p=vaadin-framework.git

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 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();