From af6dcec01f22f47489f7b369393bb55233cc1294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Tue, 14 Sep 2010 20:26:00 +0000 Subject: [PATCH] --- .../src/test/java/PackagelessEntityTest.java | 2 +- .../mysema/query/AbstractHibernateTest.java | 2 +- .../com/mysema/query/AbstractJPATest.java | 2 +- .../mysema/query/AbstractStandardTest.java | 6 ++-- .../query/HibernateQueryMutabilityTest.java | 2 +- .../mysema/query/JPAQueryMutabilityTest.java | 2 +- .../mysema/query/jpa/AbstractQueryTest.java | 3 -- .../java/com/mysema/query/jpa/Constants.java | 30 +------------------ .../com/mysema/query/jpa/FeaturesTest.java | 4 +-- .../com/mysema/query/jpa/InnerJoinTest.java | 3 -- .../com/mysema/query/jpa/IntegrationTest.java | 2 +- .../com/mysema/query/jpa/JPQLQueryTest.java | 3 +- .../mysema/query/jpa/JPQLSerializerTest.java | 2 -- .../mysema/query/jpa/JPQLSubQueryTest.java | 5 ++-- .../java/com/mysema/query/jpa/MathTest.java | 2 +- .../com/mysema/query/jpa/ParsingTest.java | 12 +------- .../com/mysema/query/jpa/QueryHelper.java | 2 -- .../mysema/query/jpa/SerializationTest.java | 2 +- .../com/mysema/query/jpa/SubQueryTest.java | 2 -- .../com/mysema/query/jpa/TypeCastTest.java | 8 ++--- .../mysema/query/jpa/UniqueResultsTest.java | 3 +- .../com/mysema/query/jpa/domain/Account.java | 1 - .../query/jpa/hibernate/sql/DerbySQLTest.java | 3 +- .../hibernate/sql/QueryMutabilityTest.java | 1 - .../mysema/query/jpa/sql/JPADerbySQLTest.java | 3 +- .../query/jpa/sql/JPAQueryMutabilityTest.java | 1 - 26 files changed, 25 insertions(+), 83 deletions(-) diff --git a/querydsl-hql/src/test/java/PackagelessEntityTest.java b/querydsl-hql/src/test/java/PackagelessEntityTest.java index 3b79b494f..a3a28a1c3 100644 --- a/querydsl-hql/src/test/java/PackagelessEntityTest.java +++ b/querydsl-hql/src/test/java/PackagelessEntityTest.java @@ -1,4 +1,4 @@ -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.junit.Test; diff --git a/querydsl-hql/src/test/java/com/mysema/query/AbstractHibernateTest.java b/querydsl-hql/src/test/java/com/mysema/query/AbstractHibernateTest.java index 3e72ca218..b7a4a3933 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/AbstractHibernateTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/AbstractHibernateTest.java @@ -18,10 +18,10 @@ import org.hibernate.Session; import org.junit.Test; import com.mysema.commons.lang.CloseableIterator; -import com.mysema.query.hql.domain.QCat; import com.mysema.query.jpa.HQLTemplates; import com.mysema.query.jpa.JPQLTemplates; import com.mysema.query.jpa.domain.Cat; +import com.mysema.query.jpa.domain.QCat; import com.mysema.query.jpa.hibernate.HibernateQuery; import com.mysema.query.jpa.hibernate.ScrollableResultsIterator; diff --git a/querydsl-hql/src/test/java/com/mysema/query/AbstractJPATest.java b/querydsl-hql/src/test/java/com/mysema/query/AbstractJPATest.java index 5b3272b0b..0ad858427 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/AbstractJPATest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/AbstractJPATest.java @@ -14,10 +14,10 @@ import javax.persistence.EntityManager; import org.junit.Test; -import com.mysema.query.hql.domain.QCat; import com.mysema.query.jpa.HQLTemplates; import com.mysema.query.jpa.JPQLTemplates; import com.mysema.query.jpa.domain.Cat; +import com.mysema.query.jpa.domain.QCat; import com.mysema.query.jpa.impl.JPAQuery; /** diff --git a/querydsl-hql/src/test/java/com/mysema/query/AbstractStandardTest.java b/querydsl-hql/src/test/java/com/mysema/query/AbstractStandardTest.java index a17560c2c..f935c6c43 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/AbstractStandardTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/AbstractStandardTest.java @@ -5,10 +5,10 @@ */ package com.mysema.query; -import static org.junit.Assert.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import java.util.ArrayList; import java.util.Arrays; @@ -23,10 +23,10 @@ import org.junit.Before; import org.junit.Test; import com.mysema.commons.lang.Pair; -import com.mysema.query.hql.domain.QCat; import com.mysema.query.jpa.JPQLQuery; import com.mysema.query.jpa.domain.Cat; import com.mysema.query.jpa.domain.DomesticCat; +import com.mysema.query.jpa.domain.QCat; import com.mysema.query.types.Expression; import com.mysema.query.types.Param; import com.mysema.query.types.ParamNotSetException; @@ -34,8 +34,8 @@ import com.mysema.query.types.expr.ArrayConstructorExpression; import com.mysema.query.types.expr.BooleanExpression; import com.mysema.query.types.expr.ConstructorExpression; import com.mysema.query.types.expr.ListExpression; -import com.mysema.query.types.expr.StringExpression; import com.mysema.query.types.expr.QTuple; +import com.mysema.query.types.expr.StringExpression; /** * @author tiwe diff --git a/querydsl-hql/src/test/java/com/mysema/query/HibernateQueryMutabilityTest.java b/querydsl-hql/src/test/java/com/mysema/query/HibernateQueryMutabilityTest.java index af49c3dc8..d33021fd8 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/HibernateQueryMutabilityTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/HibernateQueryMutabilityTest.java @@ -14,7 +14,7 @@ import org.hibernate.Session; import org.junit.Test; import org.junit.runner.RunWith; -import com.mysema.query.hql.domain.QCat; +import com.mysema.query.jpa.domain.QCat; import com.mysema.query.jpa.hibernate.HibernateQuery; import com.mysema.testutil.HibernateConfig; import com.mysema.testutil.HibernateTestRunner; diff --git a/querydsl-hql/src/test/java/com/mysema/query/JPAQueryMutabilityTest.java b/querydsl-hql/src/test/java/com/mysema/query/JPAQueryMutabilityTest.java index b7e5dae7d..c8bb37411 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/JPAQueryMutabilityTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/JPAQueryMutabilityTest.java @@ -13,7 +13,7 @@ import javax.persistence.EntityManager; import org.junit.Test; import org.junit.runner.RunWith; -import com.mysema.query.hql.domain.QCat; +import com.mysema.query.jpa.domain.QCat; import com.mysema.query.jpa.impl.JPAQuery; import com.mysema.testutil.JPAConfig; import com.mysema.testutil.JPATestRunner; diff --git a/querydsl-hql/src/test/java/com/mysema/query/jpa/AbstractQueryTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/AbstractQueryTest.java index 06b76a4d2..9993fc0e7 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/jpa/AbstractQueryTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/AbstractQueryTest.java @@ -7,9 +7,6 @@ package com.mysema.query.jpa; import static org.junit.Assert.assertEquals; -import com.mysema.query.jpa.JPQLSerializer; -import com.mysema.query.jpa.JPQLSubQuery; -import com.mysema.query.jpa.HQLTemplates; import com.mysema.query.types.Expression; public abstract class AbstractQueryTest implements Constants{ diff --git a/querydsl-hql/src/test/java/com/mysema/query/jpa/Constants.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/Constants.java index 321d694fb..28e64d700 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/jpa/Constants.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/Constants.java @@ -5,35 +5,7 @@ */ package com.mysema.query.jpa; -import com.mysema.query.hql.domain.QAccount; -import com.mysema.query.hql.domain.QAnimal; -import com.mysema.query.hql.domain.QAuditLog; -import com.mysema.query.hql.domain.QBar; -import com.mysema.query.hql.domain.QCalendar; -import com.mysema.query.hql.domain.QCat; -import com.mysema.query.hql.domain.QCatalog; -import com.mysema.query.hql.domain.QCompany; -import com.mysema.query.hql.domain.QCustomer; -import com.mysema.query.hql.domain.QDocument; -import com.mysema.query.hql.domain.QDomesticCat; -import com.mysema.query.hql.domain.QFoo; -import com.mysema.query.hql.domain.QFormula; -import com.mysema.query.hql.domain.QItem; -import com.mysema.query.hql.domain.QName; -import com.mysema.query.hql.domain.QNameList; -import com.mysema.query.hql.domain.QNamed; -import com.mysema.query.hql.domain.QOrder; -import com.mysema.query.hql.domain.QParameter; -import com.mysema.query.hql.domain.QPayment; -import com.mysema.query.hql.domain.QPerson; -import com.mysema.query.hql.domain.QPlayer; -import com.mysema.query.hql.domain.QPrice; -import com.mysema.query.hql.domain.QProduct; -import com.mysema.query.hql.domain.QShow; -import com.mysema.query.hql.domain.QStatus; -import com.mysema.query.hql.domain.QStatusChange; -import com.mysema.query.hql.domain.QStore; -import com.mysema.query.hql.domain.QUser; +import com.mysema.query.jpa.domain.*; public interface Constants { diff --git a/querydsl-hql/src/test/java/com/mysema/query/jpa/FeaturesTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/FeaturesTest.java index 657fb26a4..f0724a91a 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/jpa/FeaturesTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/FeaturesTest.java @@ -15,8 +15,8 @@ import java.math.BigInteger; import org.junit.Test; -import com.mysema.query.hql.domain.QAccount; -import com.mysema.query.hql.domain.QInheritedProperties; +import com.mysema.query.jpa.domain.QAccount; +import com.mysema.query.jpa.domain.QInheritedProperties; import com.mysema.query.types.expr.NumberExpression; import com.mysema.query.types.path.NumberPath; diff --git a/querydsl-hql/src/test/java/com/mysema/query/jpa/InnerJoinTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/InnerJoinTest.java index ef076d2f7..351fa0d95 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/jpa/InnerJoinTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/InnerJoinTest.java @@ -12,9 +12,6 @@ import java.util.List; import org.junit.Test; import com.mysema.query.alias.Alias; -import com.mysema.query.jpa.JPQLQuery; -import com.mysema.query.jpa.JPQLSubQuery; -import com.mysema.query.jpa.HQLTemplates; import com.mysema.query.jpa.hibernate.HibernateQuery; import com.mysema.query.types.path.StringPath; diff --git a/querydsl-hql/src/test/java/com/mysema/query/jpa/IntegrationTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/IntegrationTest.java index 31c1abc39..5d07fd5b0 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/jpa/IntegrationTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/IntegrationTest.java @@ -20,8 +20,8 @@ import org.junit.runner.RunWith; import antlr.RecognitionException; import antlr.TokenStreamException; -import com.mysema.query.hql.domain.QCat; import com.mysema.query.jpa.domain.Cat; +import com.mysema.query.jpa.domain.QCat; import com.mysema.query.jpa.hibernate.HibernateDeleteClause; import com.mysema.query.jpa.hibernate.HibernateQuery; import com.mysema.query.jpa.hibernate.HibernateUpdateClause; diff --git a/querydsl-hql/src/test/java/com/mysema/query/jpa/JPQLQueryTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/JPQLQueryTest.java index 4e1a0b4c5..420f734e3 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/jpa/JPQLQueryTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/JPQLQueryTest.java @@ -3,8 +3,7 @@ package com.mysema.query.jpa; import org.junit.Before; import org.junit.Test; -import com.mysema.query.hql.domain.QCat; -import com.mysema.query.jpa.JPQLQuery; +import com.mysema.query.jpa.domain.QCat; import com.mysema.query.jpa.hibernate.HibernateQuery; public class JPQLQueryTest { diff --git a/querydsl-hql/src/test/java/com/mysema/query/jpa/JPQLSerializerTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/JPQLSerializerTest.java index 7e9eb6014..2a22bdf50 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/jpa/JPQLSerializerTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/JPQLSerializerTest.java @@ -9,8 +9,6 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.mysema.query.jpa.JPQLSerializer; -import com.mysema.query.jpa.HQLTemplates; import com.mysema.query.types.path.NumberPath; public class JPQLSerializerTest { diff --git a/querydsl-hql/src/test/java/com/mysema/query/jpa/JPQLSubQueryTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/JPQLSubQueryTest.java index 92b5fc61d..b887c38fe 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/jpa/JPQLSubQueryTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/JPQLSubQueryTest.java @@ -1,11 +1,10 @@ package com.mysema.query.jpa; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.mysema.query.hql.domain.QCat; -import com.mysema.query.jpa.JPQLSubQuery; +import com.mysema.query.jpa.domain.QCat; public class JPQLSubQueryTest { diff --git a/querydsl-hql/src/test/java/com/mysema/query/jpa/MathTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/MathTest.java index 6a946c735..59d2571eb 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/jpa/MathTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/MathTest.java @@ -7,7 +7,7 @@ package com.mysema.query.jpa; import org.junit.Test; -import com.mysema.query.hql.domain.QCat; +import com.mysema.query.jpa.domain.QCat; import com.mysema.query.types.path.NumberPath; public class MathTest extends AbstractQueryTest{ diff --git a/querydsl-hql/src/test/java/com/mysema/query/jpa/ParsingTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/ParsingTest.java index 1409026b3..0c56e4200 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/jpa/ParsingTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/ParsingTest.java @@ -18,17 +18,7 @@ import org.junit.Test; import antlr.RecognitionException; import antlr.TokenStreamException; -import com.mysema.query.hql.domain.QFamily; -import com.mysema.query.hql.domain.QFooDTO; -import com.mysema.query.hql.domain.QItem; -import com.mysema.query.hql.domain.QProduct; -import com.mysema.query.jpa.domain.Cat; -import com.mysema.query.jpa.domain.Catalog; -import com.mysema.query.jpa.domain.Color; -import com.mysema.query.jpa.domain.Customer; -import com.mysema.query.jpa.domain.DomesticCat; -import com.mysema.query.jpa.domain.Payment; -import com.mysema.query.jpa.domain.Product; +import com.mysema.query.jpa.domain.*; import com.mysema.query.types.expr.ComparableExpression; import com.mysema.query.types.expr.DateExpression; import com.mysema.query.types.expr.NumberExpression; diff --git a/querydsl-hql/src/test/java/com/mysema/query/jpa/QueryHelper.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/QueryHelper.java index 60888fa49..7ba6e91e2 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/jpa/QueryHelper.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/QueryHelper.java @@ -21,8 +21,6 @@ import antlr.collections.AST; import com.mysema.commons.lang.CloseableIterator; import com.mysema.query.DefaultQueryMetadata; import com.mysema.query.SearchResults; -import com.mysema.query.jpa.JPQLQueryBase; -import com.mysema.query.jpa.HQLTemplates; import com.mysema.query.types.Expression; class QueryHelper extends JPQLQueryBase { diff --git a/querydsl-hql/src/test/java/com/mysema/query/jpa/SerializationTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/SerializationTest.java index dbb9e9130..0f08c7483 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/jpa/SerializationTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/SerializationTest.java @@ -16,7 +16,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import com.mysema.query.QueryMetadata; -import com.mysema.query.hql.domain.QCat; +import com.mysema.query.jpa.domain.QCat; import com.mysema.query.jpa.impl.JPAQuery; import com.mysema.testutil.JPAConfig; import com.mysema.testutil.JPATestRunner; diff --git a/querydsl-hql/src/test/java/com/mysema/query/jpa/SubQueryTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/SubQueryTest.java index 0a703f8cd..df1e10e9e 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/jpa/SubQueryTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/SubQueryTest.java @@ -9,8 +9,6 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.mysema.query.jpa.JPQLSubQuery; - public class SubQueryTest extends AbstractQueryTest{ @Test(expected=IllegalArgumentException.class) diff --git a/querydsl-hql/src/test/java/com/mysema/query/jpa/TypeCastTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/TypeCastTest.java index 09f152038..488328033 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/jpa/TypeCastTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/TypeCastTest.java @@ -9,13 +9,13 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.mysema.query.hql.domain.QAnimal; -import com.mysema.query.hql.domain.QCat; -import com.mysema.query.hql.domain.QInheritedProperties; -import com.mysema.query.hql.domain.QSuperclass; import com.mysema.query.jpa.domain.Animal; import com.mysema.query.jpa.domain.Cat; import com.mysema.query.jpa.domain.InheritedProperties; +import com.mysema.query.jpa.domain.QAnimal; +import com.mysema.query.jpa.domain.QCat; +import com.mysema.query.jpa.domain.QInheritedProperties; +import com.mysema.query.jpa.domain.QSuperclass; public class TypeCastTest { diff --git a/querydsl-hql/src/test/java/com/mysema/query/jpa/UniqueResultsTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/UniqueResultsTest.java index 53fcd5e82..716d6e417 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/jpa/UniqueResultsTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/UniqueResultsTest.java @@ -5,15 +5,14 @@ */ package com.mysema.query.jpa; -import static com.mysema.query.hql.domain.QCat.cat; import static org.junit.Assert.assertEquals; import org.hibernate.Session; import org.junit.Test; import org.junit.runner.RunWith; -import com.mysema.query.jpa.JPQLQuery; import com.mysema.query.jpa.domain.Cat; +import static com.mysema.query.jpa.domain.QCat.cat; import com.mysema.query.jpa.hibernate.HibernateQuery; import com.mysema.testutil.HibernateConfig; import com.mysema.testutil.HibernateTestRunner; diff --git a/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Account.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Account.java index 0089afba3..c90f3267f 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Account.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Account.java @@ -18,7 +18,6 @@ import javax.persistence.Transient; import org.junit.Test; import com.mysema.query.annotations.QueryInit; -import com.mysema.query.hql.domain.QAccount; /** * The Class Account. diff --git a/querydsl-hql/src/test/java/com/mysema/query/jpa/hibernate/sql/DerbySQLTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/hibernate/sql/DerbySQLTest.java index 4f51af47e..70398a6b1 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/jpa/hibernate/sql/DerbySQLTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/hibernate/sql/DerbySQLTest.java @@ -17,10 +17,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import com.mysema.query.SearchResults; -import com.mysema.query.hql.domain.QCat; import com.mysema.query.jpa.domain.Cat; +import com.mysema.query.jpa.domain.QCat; import com.mysema.query.jpa.domain.sql.SAnimal; -import com.mysema.query.jpa.hibernate.sql.HibernateSQLQuery; import com.mysema.query.sql.DerbyTemplates; import com.mysema.query.sql.SQLTemplates; import com.mysema.query.types.expr.ConstructorExpression; diff --git a/querydsl-hql/src/test/java/com/mysema/query/jpa/hibernate/sql/QueryMutabilityTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/hibernate/sql/QueryMutabilityTest.java index b49e03f58..54a09878e 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/jpa/hibernate/sql/QueryMutabilityTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/hibernate/sql/QueryMutabilityTest.java @@ -16,7 +16,6 @@ import org.junit.runner.RunWith; import com.mysema.query.QueryMutability; import com.mysema.query.jpa.domain.sql.SAnimal; -import com.mysema.query.jpa.hibernate.sql.HibernateSQLQuery; import com.mysema.query.sql.DerbyTemplates; import com.mysema.query.sql.SQLTemplates; import com.mysema.testutil.HibernateConfig; diff --git a/querydsl-hql/src/test/java/com/mysema/query/jpa/sql/JPADerbySQLTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/sql/JPADerbySQLTest.java index faf1deedb..b9ba75ee7 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/jpa/sql/JPADerbySQLTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/sql/JPADerbySQLTest.java @@ -21,10 +21,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import com.mysema.query.SearchResults; -import com.mysema.query.hql.domain.QCat; import com.mysema.query.jpa.domain.Cat; +import com.mysema.query.jpa.domain.QCat; import com.mysema.query.jpa.domain.sql.SAnimal; -import com.mysema.query.jpa.sql.JPASQLQuery; import com.mysema.query.sql.DerbyTemplates; import com.mysema.query.sql.SQLTemplates; import com.mysema.query.types.expr.ConstructorExpression; diff --git a/querydsl-hql/src/test/java/com/mysema/query/jpa/sql/JPAQueryMutabilityTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/sql/JPAQueryMutabilityTest.java index 82fb01c0b..af9a1cc87 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/jpa/sql/JPAQueryMutabilityTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/sql/JPAQueryMutabilityTest.java @@ -18,7 +18,6 @@ import org.junit.runner.RunWith; import com.mysema.query.QueryMutability; import com.mysema.query.jpa.domain.Cat; import com.mysema.query.jpa.domain.sql.SAnimal; -import com.mysema.query.jpa.sql.JPASQLQuery; import com.mysema.query.sql.DerbyTemplates; import com.mysema.query.sql.SQLTemplates; import com.mysema.testutil.JPAConfig;