From e15e568a9842bf6eaab405552e4bfa9e22df35dc Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Sun, 5 Feb 2012 17:10:16 +0000 Subject: [PATCH] Avoid $ package name --- .../{$ => _}/AuthorWithoutAnnotations.java | 2 +- .../org/jooq/test/{$ => _}/BookRecord.java | 2 +- .../src/org/jooq/test/{$ => _}/BookTable.java | 2 +- .../test/{$ => _}/BookWithAnnotations.java | 2 +- .../test/{$ => _}/BookWithoutAnnotations.java | 2 +- .../test/{$ => _}/CharWithAnnotations.java | 2 +- .../test/{$ => _}/DatesWithAnnotations.java | 2 +- .../test/{$ => _}/FinalWithAnnotations.java | 2 +- .../{$ => _}/FinalWithoutAnnotations.java | 2 +- .../test/{$ => _}/StaticWithAnnotations.java | 2 +- .../{$ => _}/StaticWithoutAnnotations.java | 2 +- .../AggregateWindowFunctionTests.java | 2 +- .../test/{$ => _}/testcases/CRUDTests.java | 2 +- .../{$ => _}/testcases/DataTypeTests.java | 2 +- .../test/{$ => _}/testcases/EnumTests.java | 2 +- .../test/{$ => _}/testcases/ExoticTests.java | 2 +- .../test/{$ => _}/testcases/FetchTests.java | 24 +++++----- .../test/{$ => _}/testcases/FormatTests.java | 2 +- .../{$ => _}/testcases/FunctionTests.java | 2 +- .../test/{$ => _}/testcases/GeneralTests.java | 2 +- .../test/{$ => _}/testcases/GroupByTests.java | 2 +- .../{$ => _}/testcases/InsertUpdateTests.java | 2 +- .../test/{$ => _}/testcases/JoinTests.java | 2 +- .../test/{$ => _}/testcases/LoaderTests.java | 2 +- .../test/{$ => _}/testcases/OrderByTests.java | 2 +- .../{$ => _}/testcases/PlainSQLTests.java | 2 +- .../{$ => _}/testcases/PredicateTests.java | 2 +- .../testcases/RenderAndBindTests.java | 2 +- .../testcases/RoutineAndUDTTests.java | 2 +- .../testcases/SchemaAndMappingTests.java} | 6 +-- .../test/{$ => _}/testcases/SelectTests.java | 2 +- .../test/{$ => _}/testcases/Template.java | 2 +- .../src/org/jooq/test/jOOQAbstractTest.java | 46 +++++++++---------- 33 files changed, 68 insertions(+), 68 deletions(-) rename jOOQ-test/src/org/jooq/test/{$ => _}/AuthorWithoutAnnotations.java (96%) rename jOOQ-test/src/org/jooq/test/{$ => _}/BookRecord.java (96%) rename jOOQ-test/src/org/jooq/test/{$ => _}/BookTable.java (96%) rename jOOQ-test/src/org/jooq/test/{$ => _}/BookWithAnnotations.java (96%) rename jOOQ-test/src/org/jooq/test/{$ => _}/BookWithoutAnnotations.java (96%) rename jOOQ-test/src/org/jooq/test/{$ => _}/CharWithAnnotations.java (96%) rename jOOQ-test/src/org/jooq/test/{$ => _}/DatesWithAnnotations.java (96%) rename jOOQ-test/src/org/jooq/test/{$ => _}/FinalWithAnnotations.java (96%) rename jOOQ-test/src/org/jooq/test/{$ => _}/FinalWithoutAnnotations.java (96%) rename jOOQ-test/src/org/jooq/test/{$ => _}/StaticWithAnnotations.java (96%) rename jOOQ-test/src/org/jooq/test/{$ => _}/StaticWithoutAnnotations.java (96%) rename jOOQ-test/src/org/jooq/test/{$ => _}/testcases/AggregateWindowFunctionTests.java (97%) rename jOOQ-test/src/org/jooq/test/{$ => _}/testcases/CRUDTests.java (97%) rename jOOQ-test/src/org/jooq/test/{$ => _}/testcases/DataTypeTests.java (98%) rename jOOQ-test/src/org/jooq/test/{$ => _}/testcases/EnumTests.java (97%) rename jOOQ-test/src/org/jooq/test/{$ => _}/testcases/ExoticTests.java (97%) rename jOOQ-test/src/org/jooq/test/{$ => _}/testcases/FetchTests.java (96%) rename jOOQ-test/src/org/jooq/test/{$ => _}/testcases/FormatTests.java (97%) rename jOOQ-test/src/org/jooq/test/{$ => _}/testcases/FunctionTests.java (97%) rename jOOQ-test/src/org/jooq/test/{$ => _}/testcases/GeneralTests.java (97%) rename jOOQ-test/src/org/jooq/test/{$ => _}/testcases/GroupByTests.java (97%) rename jOOQ-test/src/org/jooq/test/{$ => _}/testcases/InsertUpdateTests.java (97%) rename jOOQ-test/src/org/jooq/test/{$ => _}/testcases/JoinTests.java (97%) rename jOOQ-test/src/org/jooq/test/{$ => _}/testcases/LoaderTests.java (97%) rename jOOQ-test/src/org/jooq/test/{$ => _}/testcases/OrderByTests.java (96%) rename jOOQ-test/src/org/jooq/test/{$ => _}/testcases/PlainSQLTests.java (97%) rename jOOQ-test/src/org/jooq/test/{$ => _}/testcases/PredicateTests.java (97%) rename jOOQ-test/src/org/jooq/test/{$ => _}/testcases/RenderAndBindTests.java (96%) rename jOOQ-test/src/org/jooq/test/{$ => _}/testcases/RoutineAndUDTTests.java (97%) rename jOOQ-test/src/org/jooq/test/{$/testcases/MappingTests.java => _/testcases/SchemaAndMappingTests.java} (95%) rename jOOQ-test/src/org/jooq/test/{$ => _}/testcases/SelectTests.java (97%) rename jOOQ-test/src/org/jooq/test/{$ => _}/testcases/Template.java (96%) diff --git a/jOOQ-test/src/org/jooq/test/$/AuthorWithoutAnnotations.java b/jOOQ-test/src/org/jooq/test/_/AuthorWithoutAnnotations.java similarity index 96% rename from jOOQ-test/src/org/jooq/test/$/AuthorWithoutAnnotations.java rename to jOOQ-test/src/org/jooq/test/_/AuthorWithoutAnnotations.java index 7e8db95650..09d6ded095 100644 --- a/jOOQ-test/src/org/jooq/test/$/AuthorWithoutAnnotations.java +++ b/jOOQ-test/src/org/jooq/test/_/AuthorWithoutAnnotations.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$; +package org.jooq.test._; import java.util.Date; diff --git a/jOOQ-test/src/org/jooq/test/$/BookRecord.java b/jOOQ-test/src/org/jooq/test/_/BookRecord.java similarity index 96% rename from jOOQ-test/src/org/jooq/test/$/BookRecord.java rename to jOOQ-test/src/org/jooq/test/_/BookRecord.java index 342fd94148..88513dc18a 100644 --- a/jOOQ-test/src/org/jooq/test/$/BookRecord.java +++ b/jOOQ-test/src/org/jooq/test/_/BookRecord.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$; +package org.jooq.test._; import org.jooq.impl.CustomRecord; diff --git a/jOOQ-test/src/org/jooq/test/$/BookTable.java b/jOOQ-test/src/org/jooq/test/_/BookTable.java similarity index 96% rename from jOOQ-test/src/org/jooq/test/$/BookTable.java rename to jOOQ-test/src/org/jooq/test/_/BookTable.java index 9a94cdb6f2..5fbc6c8560 100644 --- a/jOOQ-test/src/org/jooq/test/$/BookTable.java +++ b/jOOQ-test/src/org/jooq/test/_/BookTable.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$; +package org.jooq.test._; import org.jooq.TableField; import org.jooq.impl.CustomTable; diff --git a/jOOQ-test/src/org/jooq/test/$/BookWithAnnotations.java b/jOOQ-test/src/org/jooq/test/_/BookWithAnnotations.java similarity index 96% rename from jOOQ-test/src/org/jooq/test/$/BookWithAnnotations.java rename to jOOQ-test/src/org/jooq/test/_/BookWithAnnotations.java index a0d4b921d7..88e305fabf 100644 --- a/jOOQ-test/src/org/jooq/test/$/BookWithAnnotations.java +++ b/jOOQ-test/src/org/jooq/test/_/BookWithAnnotations.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$; +package org.jooq.test._; import javax.persistence.Column; diff --git a/jOOQ-test/src/org/jooq/test/$/BookWithoutAnnotations.java b/jOOQ-test/src/org/jooq/test/_/BookWithoutAnnotations.java similarity index 96% rename from jOOQ-test/src/org/jooq/test/$/BookWithoutAnnotations.java rename to jOOQ-test/src/org/jooq/test/_/BookWithoutAnnotations.java index a47107113d..7a85496864 100644 --- a/jOOQ-test/src/org/jooq/test/$/BookWithoutAnnotations.java +++ b/jOOQ-test/src/org/jooq/test/_/BookWithoutAnnotations.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$; +package org.jooq.test._; /** diff --git a/jOOQ-test/src/org/jooq/test/$/CharWithAnnotations.java b/jOOQ-test/src/org/jooq/test/_/CharWithAnnotations.java similarity index 96% rename from jOOQ-test/src/org/jooq/test/$/CharWithAnnotations.java rename to jOOQ-test/src/org/jooq/test/_/CharWithAnnotations.java index f4f904a3a1..212fa5e095 100644 --- a/jOOQ-test/src/org/jooq/test/$/CharWithAnnotations.java +++ b/jOOQ-test/src/org/jooq/test/_/CharWithAnnotations.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$; +package org.jooq.test._; import javax.persistence.Column; diff --git a/jOOQ-test/src/org/jooq/test/$/DatesWithAnnotations.java b/jOOQ-test/src/org/jooq/test/_/DatesWithAnnotations.java similarity index 96% rename from jOOQ-test/src/org/jooq/test/$/DatesWithAnnotations.java rename to jOOQ-test/src/org/jooq/test/_/DatesWithAnnotations.java index 438b4c55e3..27872eefe2 100644 --- a/jOOQ-test/src/org/jooq/test/$/DatesWithAnnotations.java +++ b/jOOQ-test/src/org/jooq/test/_/DatesWithAnnotations.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$; +package org.jooq.test._; import java.util.Calendar; import java.util.Date; diff --git a/jOOQ-test/src/org/jooq/test/$/FinalWithAnnotations.java b/jOOQ-test/src/org/jooq/test/_/FinalWithAnnotations.java similarity index 96% rename from jOOQ-test/src/org/jooq/test/$/FinalWithAnnotations.java rename to jOOQ-test/src/org/jooq/test/_/FinalWithAnnotations.java index f1dcf50616..4bc89cfbdf 100644 --- a/jOOQ-test/src/org/jooq/test/$/FinalWithAnnotations.java +++ b/jOOQ-test/src/org/jooq/test/_/FinalWithAnnotations.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$; +package org.jooq.test._; import javax.persistence.Column; diff --git a/jOOQ-test/src/org/jooq/test/$/FinalWithoutAnnotations.java b/jOOQ-test/src/org/jooq/test/_/FinalWithoutAnnotations.java similarity index 96% rename from jOOQ-test/src/org/jooq/test/$/FinalWithoutAnnotations.java rename to jOOQ-test/src/org/jooq/test/_/FinalWithoutAnnotations.java index 1c0d02877b..8e2f38cf8f 100644 --- a/jOOQ-test/src/org/jooq/test/$/FinalWithoutAnnotations.java +++ b/jOOQ-test/src/org/jooq/test/_/FinalWithoutAnnotations.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$; +package org.jooq.test._; /** diff --git a/jOOQ-test/src/org/jooq/test/$/StaticWithAnnotations.java b/jOOQ-test/src/org/jooq/test/_/StaticWithAnnotations.java similarity index 96% rename from jOOQ-test/src/org/jooq/test/$/StaticWithAnnotations.java rename to jOOQ-test/src/org/jooq/test/_/StaticWithAnnotations.java index 2361b23aee..cb8fc72c0e 100644 --- a/jOOQ-test/src/org/jooq/test/$/StaticWithAnnotations.java +++ b/jOOQ-test/src/org/jooq/test/_/StaticWithAnnotations.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$; +package org.jooq.test._; import javax.persistence.Column; diff --git a/jOOQ-test/src/org/jooq/test/$/StaticWithoutAnnotations.java b/jOOQ-test/src/org/jooq/test/_/StaticWithoutAnnotations.java similarity index 96% rename from jOOQ-test/src/org/jooq/test/$/StaticWithoutAnnotations.java rename to jOOQ-test/src/org/jooq/test/_/StaticWithoutAnnotations.java index 259c192907..233d0e0d22 100644 --- a/jOOQ-test/src/org/jooq/test/$/StaticWithoutAnnotations.java +++ b/jOOQ-test/src/org/jooq/test/_/StaticWithoutAnnotations.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$; +package org.jooq.test._; /** * @author Lukas Eder diff --git a/jOOQ-test/src/org/jooq/test/$/testcases/AggregateWindowFunctionTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java similarity index 97% rename from jOOQ-test/src/org/jooq/test/$/testcases/AggregateWindowFunctionTests.java rename to jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java index 10c6beb4cd..7f5ad27f76 100644 --- a/jOOQ-test/src/org/jooq/test/$/testcases/AggregateWindowFunctionTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$.testcases; +package org.jooq.test._.testcases; import static java.util.Arrays.asList; import static java.util.Collections.nCopies; diff --git a/jOOQ-test/src/org/jooq/test/$/testcases/CRUDTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java similarity index 97% rename from jOOQ-test/src/org/jooq/test/$/testcases/CRUDTests.java rename to jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java index 8e895e9b47..48cd57b633 100644 --- a/jOOQ-test/src/org/jooq/test/$/testcases/CRUDTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$.testcases; +package org.jooq.test._.testcases; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNull; diff --git a/jOOQ-test/src/org/jooq/test/$/testcases/DataTypeTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java similarity index 98% rename from jOOQ-test/src/org/jooq/test/$/testcases/DataTypeTests.java rename to jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java index db36b4d85c..4f866aaf1b 100644 --- a/jOOQ-test/src/org/jooq/test/$/testcases/DataTypeTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$.testcases; +package org.jooq.test._.testcases; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; diff --git a/jOOQ-test/src/org/jooq/test/$/testcases/EnumTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/EnumTests.java similarity index 97% rename from jOOQ-test/src/org/jooq/test/$/testcases/EnumTests.java rename to jOOQ-test/src/org/jooq/test/_/testcases/EnumTests.java index f214b7da41..1bd8ae5d3a 100644 --- a/jOOQ-test/src/org/jooq/test/$/testcases/EnumTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/EnumTests.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$.testcases; +package org.jooq.test._.testcases; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; diff --git a/jOOQ-test/src/org/jooq/test/$/testcases/ExoticTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java similarity index 97% rename from jOOQ-test/src/org/jooq/test/$/testcases/ExoticTests.java rename to jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java index 3b143ce9b5..336f041b12 100644 --- a/jOOQ-test/src/org/jooq/test/$/testcases/ExoticTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$.testcases; +package org.jooq.test._.testcases; import static java.util.Arrays.asList; import static junit.framework.Assert.assertEquals; diff --git a/jOOQ-test/src/org/jooq/test/$/testcases/FetchTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java similarity index 96% rename from jOOQ-test/src/org/jooq/test/$/testcases/FetchTests.java rename to jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java index 167d493995..d26e609f97 100644 --- a/jOOQ-test/src/org/jooq/test/$/testcases/FetchTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$.testcases; +package org.jooq.test._.testcases; import static java.util.Arrays.asList; import static junit.framework.Assert.assertEquals; @@ -70,17 +70,17 @@ import org.jooq.exception.InvalidResultException; import org.jooq.exception.MappingException; import org.jooq.test.BaseTest; import org.jooq.test.jOOQAbstractTest; -import org.jooq.test.$.AuthorWithoutAnnotations; -import org.jooq.test.$.BookRecord; -import org.jooq.test.$.BookTable; -import org.jooq.test.$.BookWithAnnotations; -import org.jooq.test.$.BookWithoutAnnotations; -import org.jooq.test.$.CharWithAnnotations; -import org.jooq.test.$.DatesWithAnnotations; -import org.jooq.test.$.FinalWithAnnotations; -import org.jooq.test.$.FinalWithoutAnnotations; -import org.jooq.test.$.StaticWithAnnotations; -import org.jooq.test.$.StaticWithoutAnnotations; +import org.jooq.test._.AuthorWithoutAnnotations; +import org.jooq.test._.BookRecord; +import org.jooq.test._.BookTable; +import org.jooq.test._.BookWithAnnotations; +import org.jooq.test._.BookWithoutAnnotations; +import org.jooq.test._.CharWithAnnotations; +import org.jooq.test._.DatesWithAnnotations; +import org.jooq.test._.FinalWithAnnotations; +import org.jooq.test._.FinalWithoutAnnotations; +import org.jooq.test._.StaticWithAnnotations; +import org.jooq.test._.StaticWithoutAnnotations; import org.junit.Test; diff --git a/jOOQ-test/src/org/jooq/test/$/testcases/FormatTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/FormatTests.java similarity index 97% rename from jOOQ-test/src/org/jooq/test/$/testcases/FormatTests.java rename to jOOQ-test/src/org/jooq/test/_/testcases/FormatTests.java index 411614729b..b75e10883a 100644 --- a/jOOQ-test/src/org/jooq/test/$/testcases/FormatTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/FormatTests.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$.testcases; +package org.jooq.test._.testcases; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; diff --git a/jOOQ-test/src/org/jooq/test/$/testcases/FunctionTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java similarity index 97% rename from jOOQ-test/src/org/jooq/test/$/testcases/FunctionTests.java rename to jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java index da5b2968a0..59621b9dba 100644 --- a/jOOQ-test/src/org/jooq/test/$/testcases/FunctionTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$.testcases; +package org.jooq.test._.testcases; import static java.util.Arrays.asList; import static junit.framework.Assert.assertEquals; diff --git a/jOOQ-test/src/org/jooq/test/$/testcases/GeneralTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java similarity index 97% rename from jOOQ-test/src/org/jooq/test/$/testcases/GeneralTests.java rename to jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java index 009627be3c..29bc86505c 100644 --- a/jOOQ-test/src/org/jooq/test/$/testcases/GeneralTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$.testcases; +package org.jooq.test._.testcases; import static java.util.Arrays.asList; import static junit.framework.Assert.assertEquals; diff --git a/jOOQ-test/src/org/jooq/test/$/testcases/GroupByTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java similarity index 97% rename from jOOQ-test/src/org/jooq/test/$/testcases/GroupByTests.java rename to jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java index a4c7a5ca8b..74b4027a5b 100644 --- a/jOOQ-test/src/org/jooq/test/$/testcases/GroupByTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$.testcases; +package org.jooq.test._.testcases; import static java.util.Arrays.asList; import static junit.framework.Assert.assertEquals; diff --git a/jOOQ-test/src/org/jooq/test/$/testcases/InsertUpdateTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java similarity index 97% rename from jOOQ-test/src/org/jooq/test/$/testcases/InsertUpdateTests.java rename to jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java index a797cce39c..19a18a7d8b 100644 --- a/jOOQ-test/src/org/jooq/test/$/testcases/InsertUpdateTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$.testcases; +package org.jooq.test._.testcases; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; diff --git a/jOOQ-test/src/org/jooq/test/$/testcases/JoinTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java similarity index 97% rename from jOOQ-test/src/org/jooq/test/$/testcases/JoinTests.java rename to jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java index b3fcab092d..a93c9c5c6a 100644 --- a/jOOQ-test/src/org/jooq/test/$/testcases/JoinTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$.testcases; +package org.jooq.test._.testcases; import static java.util.Arrays.asList; import static junit.framework.Assert.assertEquals; diff --git a/jOOQ-test/src/org/jooq/test/$/testcases/LoaderTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/LoaderTests.java similarity index 97% rename from jOOQ-test/src/org/jooq/test/$/testcases/LoaderTests.java rename to jOOQ-test/src/org/jooq/test/_/testcases/LoaderTests.java index 5f2b097d1c..29551cf679 100644 --- a/jOOQ-test/src/org/jooq/test/$/testcases/LoaderTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/LoaderTests.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$.testcases; +package org.jooq.test._.testcases; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; diff --git a/jOOQ-test/src/org/jooq/test/$/testcases/OrderByTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java similarity index 96% rename from jOOQ-test/src/org/jooq/test/$/testcases/OrderByTests.java rename to jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java index bf8b3a870b..a4eed0a264 100644 --- a/jOOQ-test/src/org/jooq/test/$/testcases/OrderByTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$.testcases; +package org.jooq.test._.testcases; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNull; diff --git a/jOOQ-test/src/org/jooq/test/$/testcases/PlainSQLTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java similarity index 97% rename from jOOQ-test/src/org/jooq/test/$/testcases/PlainSQLTests.java rename to jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java index deed428913..140975248c 100644 --- a/jOOQ-test/src/org/jooq/test/$/testcases/PlainSQLTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$.testcases; +package org.jooq.test._.testcases; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; diff --git a/jOOQ-test/src/org/jooq/test/$/testcases/PredicateTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/PredicateTests.java similarity index 97% rename from jOOQ-test/src/org/jooq/test/$/testcases/PredicateTests.java rename to jOOQ-test/src/org/jooq/test/_/testcases/PredicateTests.java index f769c894d8..c9fd10869c 100644 --- a/jOOQ-test/src/org/jooq/test/$/testcases/PredicateTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/PredicateTests.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$.testcases; +package org.jooq.test._.testcases; import static java.util.Arrays.asList; import static junit.framework.Assert.assertEquals; diff --git a/jOOQ-test/src/org/jooq/test/$/testcases/RenderAndBindTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/RenderAndBindTests.java similarity index 96% rename from jOOQ-test/src/org/jooq/test/$/testcases/RenderAndBindTests.java rename to jOOQ-test/src/org/jooq/test/_/testcases/RenderAndBindTests.java index 152f94545f..7133079506 100644 --- a/jOOQ-test/src/org/jooq/test/$/testcases/RenderAndBindTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/RenderAndBindTests.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$.testcases; +package org.jooq.test._.testcases; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNull; diff --git a/jOOQ-test/src/org/jooq/test/$/testcases/RoutineAndUDTTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java similarity index 97% rename from jOOQ-test/src/org/jooq/test/$/testcases/RoutineAndUDTTests.java rename to jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java index b1ce73b283..8fc15c3a54 100644 --- a/jOOQ-test/src/org/jooq/test/$/testcases/RoutineAndUDTTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$.testcases; +package org.jooq.test._.testcases; import static java.util.Arrays.asList; import static junit.framework.Assert.assertEquals; diff --git a/jOOQ-test/src/org/jooq/test/$/testcases/MappingTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java similarity index 95% rename from jOOQ-test/src/org/jooq/test/$/testcases/MappingTests.java rename to jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java index ecd03cdc86..0ea003eeca 100644 --- a/jOOQ-test/src/org/jooq/test/$/testcases/MappingTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$.testcases; +package org.jooq.test._.testcases; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; @@ -56,7 +56,7 @@ import org.jooq.test.jOOQMySQLTestSchemaRewrite; import org.junit.Test; -public class MappingTests< +public class SchemaAndMappingTests< A extends UpdatableRecord, B extends UpdatableRecord, S extends UpdatableRecord, @@ -74,7 +74,7 @@ public class MappingTests< T785 extends TableRecord> extends BaseTest { - public MappingTests(jOOQAbstractTest delegate) { + public SchemaAndMappingTests(jOOQAbstractTest delegate) { super(delegate); } diff --git a/jOOQ-test/src/org/jooq/test/$/testcases/SelectTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java similarity index 97% rename from jOOQ-test/src/org/jooq/test/$/testcases/SelectTests.java rename to jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java index 36e223ccc9..93f3a7f0ac 100644 --- a/jOOQ-test/src/org/jooq/test/$/testcases/SelectTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$.testcases; +package org.jooq.test._.testcases; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; diff --git a/jOOQ-test/src/org/jooq/test/$/testcases/Template.java b/jOOQ-test/src/org/jooq/test/_/testcases/Template.java similarity index 96% rename from jOOQ-test/src/org/jooq/test/$/testcases/Template.java rename to jOOQ-test/src/org/jooq/test/_/testcases/Template.java index 6422e00884..907aff2b6b 100644 --- a/jOOQ-test/src/org/jooq/test/$/testcases/Template.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/Template.java @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package org.jooq.test.$.testcases; +package org.jooq.test._.testcases; import org.jooq.TableRecord; import org.jooq.UpdatableRecord; diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java index a5d616a2d0..762ac9c975 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java @@ -70,26 +70,26 @@ import org.jooq.UDTRecord; import org.jooq.UpdatableRecord; import org.jooq.UpdatableTable; import org.jooq.impl.Factory; -import org.jooq.test.$.testcases.AggregateWindowFunctionTests; -import org.jooq.test.$.testcases.CRUDTests; -import org.jooq.test.$.testcases.DataTypeTests; -import org.jooq.test.$.testcases.EnumTests; -import org.jooq.test.$.testcases.ExoticTests; -import org.jooq.test.$.testcases.FetchTests; -import org.jooq.test.$.testcases.FormatTests; -import org.jooq.test.$.testcases.FunctionTests; -import org.jooq.test.$.testcases.GeneralTests; -import org.jooq.test.$.testcases.GroupByTests; -import org.jooq.test.$.testcases.InsertUpdateTests; -import org.jooq.test.$.testcases.JoinTests; -import org.jooq.test.$.testcases.LoaderTests; -import org.jooq.test.$.testcases.MappingTests; -import org.jooq.test.$.testcases.OrderByTests; -import org.jooq.test.$.testcases.PlainSQLTests; -import org.jooq.test.$.testcases.PredicateTests; -import org.jooq.test.$.testcases.RenderAndBindTests; -import org.jooq.test.$.testcases.RoutineAndUDTTests; -import org.jooq.test.$.testcases.SelectTests; +import org.jooq.test._.testcases.AggregateWindowFunctionTests; +import org.jooq.test._.testcases.CRUDTests; +import org.jooq.test._.testcases.DataTypeTests; +import org.jooq.test._.testcases.EnumTests; +import org.jooq.test._.testcases.ExoticTests; +import org.jooq.test._.testcases.FetchTests; +import org.jooq.test._.testcases.FormatTests; +import org.jooq.test._.testcases.FunctionTests; +import org.jooq.test._.testcases.GeneralTests; +import org.jooq.test._.testcases.GroupByTests; +import org.jooq.test._.testcases.InsertUpdateTests; +import org.jooq.test._.testcases.JoinTests; +import org.jooq.test._.testcases.LoaderTests; +import org.jooq.test._.testcases.OrderByTests; +import org.jooq.test._.testcases.PlainSQLTests; +import org.jooq.test._.testcases.PredicateTests; +import org.jooq.test._.testcases.RenderAndBindTests; +import org.jooq.test._.testcases.RoutineAndUDTTests; +import org.jooq.test._.testcases.SchemaAndMappingTests; +import org.jooq.test._.testcases.SelectTests; import org.jooq.tools.JooqLogger; import org.jooq.tools.StopWatch; import org.jooq.tools.StringUtils; @@ -587,17 +587,17 @@ public abstract class jOOQAbstractTest< // IMPORTANT! Make this the an early test, to check for attaching side-effects @Test public void testUse() throws Exception { - new MappingTests(this).testUse(); + new SchemaAndMappingTests(this).testUse(); } @Test public void testTableMapping() throws Exception { - new MappingTests(this).testTableMapping(); + new SchemaAndMappingTests(this).testTableMapping(); } @Test public void testSchemaMapping() throws Exception { - new MappingTests(this).testSchemaMapping(); + new SchemaAndMappingTests(this).testSchemaMapping(); } @Test