From 4bf76058d80e3024c64004f2fa46cf2c17cb35c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Wed, 28 Jul 2010 15:49:57 +0000 Subject: [PATCH] moved test classes to inheritance and extensions packages --- .../query/{domain => extensions}/QueryExtensions2Test.java | 2 +- .../query/{domain => extensions}/QueryExtensions3Test.java | 2 +- .../query/{domain => extensions}/QueryExtensions4Test.java | 2 +- .../query/{domain => extensions}/QueryExtensions5Test.java | 2 +- .../query/{domain => extensions}/QueryExtensions6Test.java | 4 ++-- .../query/{domain => extensions}/QueryExtensions7Test.java | 2 +- .../query/{domain => extensions}/QueryExtensions8Test.java | 2 +- .../query/{domain => extensions}/QueryExtensions9Test.java | 2 +- .../query/{domain => extensions}/QueryExtensionsTest.java | 2 +- .../query/{domain => inheritance}/Inheritance10Test.java | 2 +- .../query/{domain => inheritance}/Inheritance2Test.java | 2 +- .../query/{domain => inheritance}/Inheritance3Test.java | 3 ++- .../query/{domain => inheritance}/Inheritance4Test.java | 3 ++- .../query/{domain => inheritance}/Inheritance5Test.java | 2 +- .../query/{domain => inheritance}/Inheritance6Test.java | 2 +- .../query/{domain => inheritance}/Inheritance7Test.java | 2 +- .../query/{domain => inheritance}/Inheritance8Test.java | 4 +++- .../query/{domain => inheritance}/Inheritance9Test.java | 3 ++- .../mysema/query/{domain => inheritance}/InheritanceTest.java | 2 +- 19 files changed, 25 insertions(+), 20 deletions(-) rename querydsl-apt/src/test/java/com/mysema/query/{domain => extensions}/QueryExtensions2Test.java (97%) rename querydsl-apt/src/test/java/com/mysema/query/{domain => extensions}/QueryExtensions3Test.java (97%) rename querydsl-apt/src/test/java/com/mysema/query/{domain => extensions}/QueryExtensions4Test.java (97%) rename querydsl-apt/src/test/java/com/mysema/query/{domain => extensions}/QueryExtensions5Test.java (97%) rename querydsl-apt/src/test/java/com/mysema/query/{domain => extensions}/QueryExtensions6Test.java (92%) rename querydsl-apt/src/test/java/com/mysema/query/{domain => extensions}/QueryExtensions7Test.java (96%) rename querydsl-apt/src/test/java/com/mysema/query/{domain => extensions}/QueryExtensions8Test.java (98%) rename querydsl-apt/src/test/java/com/mysema/query/{domain => extensions}/QueryExtensions9Test.java (99%) rename querydsl-apt/src/test/java/com/mysema/query/{domain => extensions}/QueryExtensionsTest.java (98%) rename querydsl-apt/src/test/java/com/mysema/query/{domain => inheritance}/Inheritance10Test.java (97%) rename querydsl-apt/src/test/java/com/mysema/query/{domain => inheritance}/Inheritance2Test.java (95%) rename querydsl-apt/src/test/java/com/mysema/query/{domain => inheritance}/Inheritance3Test.java (93%) rename querydsl-apt/src/test/java/com/mysema/query/{domain => inheritance}/Inheritance4Test.java (93%) rename querydsl-apt/src/test/java/com/mysema/query/{domain => inheritance}/Inheritance5Test.java (96%) rename querydsl-apt/src/test/java/com/mysema/query/{domain => inheritance}/Inheritance6Test.java (98%) rename querydsl-apt/src/test/java/com/mysema/query/{domain => inheritance}/Inheritance7Test.java (97%) rename querydsl-apt/src/test/java/com/mysema/query/{domain => inheritance}/Inheritance8Test.java (85%) rename querydsl-apt/src/test/java/com/mysema/query/{domain => inheritance}/Inheritance9Test.java (90%) rename querydsl-apt/src/test/java/com/mysema/query/{domain => inheritance}/InheritanceTest.java (97%) diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensions2Test.java b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions2Test.java similarity index 97% rename from querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensions2Test.java rename to querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions2Test.java index 2c1abdfcd..c66d0a253 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensions2Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions2Test.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.domain; +package com.mysema.query.extensions; import static org.junit.Assert.assertEquals; diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensions3Test.java b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions3Test.java similarity index 97% rename from querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensions3Test.java rename to querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions3Test.java index cd61189bc..3ca64b54c 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensions3Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions3Test.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.domain; +package com.mysema.query.extensions; import static org.junit.Assert.assertEquals; diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensions4Test.java b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions4Test.java similarity index 97% rename from querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensions4Test.java rename to querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions4Test.java index 3e0cce75b..5040a0db6 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensions4Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions4Test.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.domain; +package com.mysema.query.extensions; import static org.junit.Assert.assertEquals; diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensions5Test.java b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions5Test.java similarity index 97% rename from querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensions5Test.java rename to querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions5Test.java index 9b3a0a72c..82be7b8d8 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensions5Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions5Test.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.domain; +package com.mysema.query.extensions; import static org.junit.Assert.assertNotNull; diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensions6Test.java b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions6Test.java similarity index 92% rename from querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensions6Test.java rename to querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions6Test.java index d8c6f7f11..009a5b06a 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensions6Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions6Test.java @@ -1,6 +1,6 @@ -package com.mysema.query.domain; +package com.mysema.query.extensions; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.junit.Test; diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensions7Test.java b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions7Test.java similarity index 96% rename from querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensions7Test.java rename to querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions7Test.java index e04b56185..601351fae 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensions7Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions7Test.java @@ -1,4 +1,4 @@ -package com.mysema.query.domain; +package com.mysema.query.extensions; import static org.junit.Assert.assertNotNull; diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensions8Test.java b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions8Test.java similarity index 98% rename from querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensions8Test.java rename to querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions8Test.java index 1f6103e44..c40f94fb6 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensions8Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions8Test.java @@ -1,4 +1,4 @@ -package com.mysema.query.domain; +package com.mysema.query.extensions; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensions9Test.java b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions9Test.java similarity index 99% rename from querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensions9Test.java rename to querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions9Test.java index 7fc15339e..569ff9971 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensions9Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions9Test.java @@ -1,4 +1,4 @@ -package com.mysema.query.domain; +package com.mysema.query.extensions; import static org.junit.Assert.assertEquals; diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensionsTest.java b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensionsTest.java similarity index 98% rename from querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensionsTest.java rename to querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensionsTest.java index ec2878ac1..10c5d62e0 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryExtensionsTest.java +++ b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensionsTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.domain; +package com.mysema.query.extensions; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance10Test.java b/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance10Test.java similarity index 97% rename from querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance10Test.java rename to querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance10Test.java index 6e4e0672a..9df281833 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance10Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance10Test.java @@ -1,4 +1,4 @@ -package com.mysema.query.domain; +package com.mysema.query.inheritance; import static org.junit.Assert.assertEquals; diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance2Test.java b/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance2Test.java similarity index 95% rename from querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance2Test.java rename to querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance2Test.java index 90f810dc8..7f0eb5052 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance2Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance2Test.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.domain; +package com.mysema.query.inheritance; import org.junit.Test; diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance3Test.java b/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance3Test.java similarity index 93% rename from querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance3Test.java rename to querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance3Test.java index 5c9678e17..a9193d2f6 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance3Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance3Test.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.domain; +package com.mysema.query.inheritance; import java.util.Collection; import java.util.List; @@ -13,6 +13,7 @@ import java.util.Set; import org.junit.Test; import com.mysema.query.annotations.QueryEntity; +import com.mysema.query.domain.AbstractTest; import com.mysema.query.types.path.PSimple; import com.mysema.query.types.path.PString; diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance4Test.java b/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance4Test.java similarity index 93% rename from querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance4Test.java rename to querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance4Test.java index bc3cb01da..b9bd8aaf7 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance4Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance4Test.java @@ -3,11 +3,12 @@ * All rights reserved. * */ -package com.mysema.query.domain; +package com.mysema.query.inheritance; import org.junit.Test; import com.mysema.query.annotations.QueryEntity; +import com.mysema.query.domain.AbstractTest; import com.mysema.query.types.path.PNumber; import com.mysema.query.types.path.PSimple; import com.mysema.query.types.path.PString; diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance5Test.java b/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance5Test.java similarity index 96% rename from querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance5Test.java rename to querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance5Test.java index e09d4db76..6dabd96ae 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance5Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance5Test.java @@ -1,4 +1,4 @@ -package com.mysema.query.domain; +package com.mysema.query.inheritance; import static org.junit.Assert.assertEquals; diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance6Test.java b/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance6Test.java similarity index 98% rename from querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance6Test.java rename to querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance6Test.java index 3d8ba0fb4..a3fbcc1ac 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance6Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance6Test.java @@ -1,4 +1,4 @@ -package com.mysema.query.domain; +package com.mysema.query.inheritance; import static org.junit.Assert.assertEquals; diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance7Test.java b/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance7Test.java similarity index 97% rename from querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance7Test.java rename to querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance7Test.java index 6149c794f..e6684265b 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance7Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance7Test.java @@ -1,4 +1,4 @@ -package com.mysema.query.domain; +package com.mysema.query.inheritance; import static org.junit.Assert.assertEquals; diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance8Test.java b/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance8Test.java similarity index 85% rename from querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance8Test.java rename to querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance8Test.java index b887d3832..64e73bff1 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance8Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance8Test.java @@ -1,10 +1,12 @@ -package com.mysema.query.domain; +package com.mysema.query.inheritance; import static org.junit.Assert.assertEquals; import org.junit.Test; import com.mysema.query.annotations.QueryEntity; +import com.mysema.query.domain.CommonIdentifiable; +import com.mysema.query.domain.CommonPersistence; import com.mysema.query.types.path.PNumber; public class Inheritance8Test { diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance9Test.java b/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance9Test.java similarity index 90% rename from querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance9Test.java rename to querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance9Test.java index 9ec061e40..dadfe2b95 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/Inheritance9Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance9Test.java @@ -1,10 +1,11 @@ -package com.mysema.query.domain; +package com.mysema.query.inheritance; import static org.junit.Assert.assertNotNull; import org.junit.Test; import com.mysema.query.annotations.QueryEntity; +import com.mysema.query.domain.SuperSupertype; /** * related to https://bugs.launchpad.net/querydsl/+bug/538148 diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/InheritanceTest.java b/querydsl-apt/src/test/java/com/mysema/query/inheritance/InheritanceTest.java similarity index 97% rename from querydsl-apt/src/test/java/com/mysema/query/domain/InheritanceTest.java rename to querydsl-apt/src/test/java/com/mysema/query/inheritance/InheritanceTest.java index a66de17a0..2c6d82dcc 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/InheritanceTest.java +++ b/querydsl-apt/src/test/java/com/mysema/query/inheritance/InheritanceTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.domain; +package com.mysema.query.inheritance; import static org.junit.Assert.assertNotNull;