From de112d13a3a12b758ca688509ced7afd86b03755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Mon, 7 Jun 2010 17:46:47 +0000 Subject: [PATCH] moved test classes to com.mysema.query.collections --- .../com/mysema/query/collections/AbstractColQuery.java | 4 +--- .../java/com/mysema/query/collections/ColQueryImpl.java | 7 +++++++ .../query/{ => collections}/CompilationOverheadTest.java | 3 +-- .../query/{ => collections}/QueryMutabilityTest.java | 4 ++-- 4 files changed, 11 insertions(+), 7 deletions(-) rename querydsl-collections/src/test/java/com/mysema/query/{ => collections}/CompilationOverheadTest.java (95%) rename querydsl-collections/src/test/java/com/mysema/query/{ => collections}/QueryMutabilityTest.java (86%) diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/AbstractColQuery.java b/querydsl-collections/src/main/java/com/mysema/query/collections/AbstractColQuery.java index aa7c9b6f2..42bda93dd 100644 --- a/querydsl-collections/src/main/java/com/mysema/query/collections/AbstractColQuery.java +++ b/querydsl-collections/src/main/java/com/mysema/query/collections/AbstractColQuery.java @@ -75,9 +75,7 @@ public abstract class AbstractColQuery> extends P return (Q)this; } - protected QueryMetadata getMetadata() { - return queryMixin.getMetadata(); - } + public abstract QueryMetadata getMetadata(); protected QueryEngine getQueryEngine(){ return queryEngine; diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/ColQueryImpl.java b/querydsl-collections/src/main/java/com/mysema/query/collections/ColQueryImpl.java index 1612b9f1a..06f8c3984 100644 --- a/querydsl-collections/src/main/java/com/mysema/query/collections/ColQueryImpl.java +++ b/querydsl-collections/src/main/java/com/mysema/query/collections/ColQueryImpl.java @@ -48,5 +48,12 @@ public class ColQueryImpl extends AbstractColQuery implements ColQ public ColQueryImpl clone(){ return new ColQueryImpl(queryMixin.getMetadata(), getQueryEngine()); } + + /** + * @return + */ + public QueryMetadata getMetadata() { + return queryMixin.getMetadata(); + } } \ No newline at end of file diff --git a/querydsl-collections/src/test/java/com/mysema/query/CompilationOverheadTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/CompilationOverheadTest.java similarity index 95% rename from querydsl-collections/src/test/java/com/mysema/query/CompilationOverheadTest.java rename to querydsl-collections/src/test/java/com/mysema/query/collections/CompilationOverheadTest.java index 7579b9637..16ae608b5 100644 --- a/querydsl-collections/src/test/java/com/mysema/query/CompilationOverheadTest.java +++ b/querydsl-collections/src/test/java/com/mysema/query/collections/CompilationOverheadTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query; +package com.mysema.query.collections; import java.util.Arrays; import java.util.Collections; @@ -12,7 +12,6 @@ import java.util.List; import org.junit.Test; import com.mysema.query.animal.QCat; -import com.mysema.query.collections.Cat; import com.mysema.query.collections.MiniApi; import com.mysema.query.types.expr.EBoolean; diff --git a/querydsl-collections/src/test/java/com/mysema/query/QueryMutabilityTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/QueryMutabilityTest.java similarity index 86% rename from querydsl-collections/src/test/java/com/mysema/query/QueryMutabilityTest.java rename to querydsl-collections/src/test/java/com/mysema/query/collections/QueryMutabilityTest.java index c7a939560..3d7b79f8f 100644 --- a/querydsl-collections/src/test/java/com/mysema/query/QueryMutabilityTest.java +++ b/querydsl-collections/src/test/java/com/mysema/query/collections/QueryMutabilityTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query; +package com.mysema.query.collections; import java.io.IOException; import java.lang.reflect.InvocationTargetException; @@ -11,8 +11,8 @@ import java.util.Collections; import org.junit.Test; +import com.mysema.query.QueryMutability; import com.mysema.query.animal.QCat; -import com.mysema.query.collections.Cat; import com.mysema.query.collections.ColQueryImpl; public class QueryMutabilityTest {