From 19ec7127b0dc414d2ae5fa24df4deddf40aff5db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Sun, 22 Jun 2014 18:23:10 +0300 Subject: [PATCH] Add exclusions --- .../java/com/mysema/query/InsertBase.java | 5 ++++- .../test/java/com/mysema/query/UnionBase.java | 22 +++++++------------ 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/querydsl-sql/src/test/java/com/mysema/query/InsertBase.java b/querydsl-sql/src/test/java/com/mysema/query/InsertBase.java index c0537524c..93bd9e19b 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/InsertBase.java +++ b/querydsl-sql/src/test/java/com/mysema/query/InsertBase.java @@ -271,7 +271,7 @@ public class InsertBase extends AbstractBaseTest { } @Test - @ExcludeIn({HSQLDB, CUBRID, DERBY}) + @ExcludeIn({HSQLDB, CUBRID, DERBY, FIREBIRD}) public void Insert_With_SubQuery2() { // insert into modules(name) // select 'MyModule' @@ -329,6 +329,7 @@ public class InsertBase extends AbstractBaseTest { } @Test + @ExcludeIn(FIREBIRD) // too slow public void Insert_With_SubQuery_Without_Columns() { int count = (int)query().from(survey).count(); assertEquals(count, insert(survey) @@ -338,12 +339,14 @@ public class InsertBase extends AbstractBaseTest { } @Test + @ExcludeIn(FIREBIRD) // too slow public void Insert_Without_Columns() { assertEquals(1, insert(survey).values(4, "Hello", "World").execute()); } @Test + @ExcludeIn(FIREBIRD) // too slow public void InsertBatch_with_Subquery() { SQLInsertClause insert = insert(survey) .columns(survey.id, survey.name) diff --git a/querydsl-sql/src/test/java/com/mysema/query/UnionBase.java b/querydsl-sql/src/test/java/com/mysema/query/UnionBase.java index 47f897bae..3c97383f7 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/UnionBase.java +++ b/querydsl-sql/src/test/java/com/mysema/query/UnionBase.java @@ -1,22 +1,10 @@ package com.mysema.query; -import static com.mysema.query.Constants.employee; -import static com.mysema.query.Target.CUBRID; -import static com.mysema.query.Target.DERBY; -import static com.mysema.query.Target.MYSQL; -import static com.mysema.query.Target.TERADATA; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import java.sql.SQLException; import java.util.Arrays; import java.util.List; -import org.junit.Test; - import com.mysema.commons.lang.CloseableIterator; import com.mysema.query.sql.domain.Employee; import com.mysema.query.sql.domain.QEmployee; @@ -27,6 +15,10 @@ import com.mysema.query.types.query.ListSubQuery; import com.mysema.query.types.query.SimpleSubQuery; import com.mysema.query.types.template.NumberTemplate; import com.mysema.testutil.ExcludeIn; +import org.junit.Test; +import static com.mysema.query.Constants.employee; +import static com.mysema.query.Target.*; +import static org.junit.Assert.*; public class UnionBase extends AbstractBaseTest { @@ -110,7 +102,7 @@ public class UnionBase extends AbstractBaseTest { // FIXME for CUBRID // Teradata: The ORDER BY clause must contain only integer constants. @Test - @ExcludeIn({DERBY, CUBRID, TERADATA}) + @ExcludeIn({DERBY, CUBRID, FIREBIRD, TERADATA}) public void Union5() { /* (select e.ID, e.FIRSTNAME, superior.ID as sup_id, superior.FIRSTNAME as sup_name * from EMPLOYEE e join EMPLOYEE superior on e.SUPERIOR_ID = superior.ID) @@ -131,7 +123,7 @@ public class UnionBase extends AbstractBaseTest { } @Test - @ExcludeIn(TERADATA) // The ORDER BY clause must contain only integer constants. + @ExcludeIn({FIREBIRD, TERADATA}) // The ORDER BY clause must contain only integer constants. @SuppressWarnings("unchecked") public void Union_With_Order() throws SQLException { SubQueryExpression sq1 = sq().from(employee).unique(employee.id); @@ -142,6 +134,7 @@ public class UnionBase extends AbstractBaseTest { @SuppressWarnings("unchecked") @Test + @ExcludeIn(FIREBIRD) public void Union_Multi_Column_Projection_List() throws IOException{ SubQueryExpression sq1 = sq().from(employee).unique(employee.id.max(), employee.id.max().subtract(1)); SubQueryExpression sq2 = sq().from(employee).unique(employee.id.min(), employee.id.min().subtract(1)); @@ -154,6 +147,7 @@ public class UnionBase extends AbstractBaseTest { @SuppressWarnings("unchecked") @Test + @ExcludeIn(FIREBIRD) public void Union_Multi_Column_Projection_Iterate() throws IOException{ SubQueryExpression sq1 = sq().from(employee).unique(employee.id.max(), employee.id.max().subtract(1)); SubQueryExpression sq2 = sq().from(employee).unique(employee.id.min(), employee.id.min().subtract(1));